test code

WuFeiPeng007 · WuFeiPeng007 · commit 4fb104d2f6ad · 2019-01-16T16:11:07.000+08:00
diff --git a/src/smartContract.js b/src/smartContract.js
@@ -920,7 +920,11 @@ function getNewDeployCtrAddr(chainSQL, txHash){
 }
 
 function calculateCtrAddr(ctrOwnerAddr, sequence){
+<<<<<<< Updated upstream
 	let hexAddrStr = chainsqlUtils.decodeChainsqlAddr(ctrOwnerAddr).toUpperCase();
+=======
+	let hexAddrStr = decodeChainsqlAddr(ctrOwnerAddr);
+>>>>>>> Stashed changes
 	let hexSeqStr = dec2FixLenHex(sequence, 2*4);
 	let hexFinalStr = hexAddrStr + hexSeqStr;
 	return keypairs.deriveAddress(hexFinalStr);
diff --git a/test/smartContractTest.js b/test/smartContractTest.js
@@ -18,7 +18,7 @@ main();
 
 async function main(){
 	try {
-		await chainsql.connect("ws://127.0.0.1:5215");
+		await chainsql.connect("ws://127.0.0.1:6007");
 		console.log("connected successfully");
 
 		chainsql.as(RootUser);
diff --git a/test/test.js b/test/test.js
@@ -26,7 +26,7 @@ var issuer = {
 // }
 
 
-var sTableName = "a2";
+var sTableName = "a5";
 var sTableName2 = "b1";
 var sReName = "boy1234";
 var sTableName3 = "hijack12";
@@ -43,13 +43,17 @@ async function main(){
 
 		// c.setRestrict(true);
 		//激活user账户
+<<<<<<< Updated upstream
 		//  await activateAccount(user.address);
+=======
+		// await activateAccount(user.address);
+>>>>>>> Stashed changes
 
 		//await testSubscribe();
 
 		// await testRippleAPI();
 		// await testAccount();
-		// await testChainsql();
+		 await testChainsql();
 
 		//await c.disconnect();
 		console.log('运行结束')
@@ -137,7 +141,7 @@ async function testAccount(){
 }
 
 async function testChainsql(){
-	// await testCreateTable();
+	 await testCreateTable();
 
 	// // //创建另一张表，用来测试rename,drop
 	// await testCreateTable1();
@@ -151,8 +155,12 @@ async function testChainsql(){
 	// await testTxs();
 	// await insertAfterGrant();
 	// await testOperationRule();
+<<<<<<< Updated upstream
 	await testAccountTables();
 	await testTableAuth();
+=======
+	//await testAccountTables();
+>>>>>>> Stashed changes
 
 	//现在底层不允许直接删除所有记录这种操作了
 	// await testDeleteAll();
@@ -186,7 +194,7 @@ function unsubTable(tb, owner) {
 var testCreateTable = async function() {
 	var raw = [
 		{'field':'id','type':'int','length':11,'PK':1,'NN':1},
-		{'field':'name','type':'varchar','length':50,'default':null},
+		{'field':'name','type':'varchar','length':50,'default':""},
 		{'field':'age','type':'int'}
 	]
 	var option = {
diff --git a/test/testContractTableTxs.js b/test/testContractTableTxs.js
@@ -69,8 +69,8 @@ async function main() {
 
     /**************************************/
     // userOperation = user;
-    const contractAddr = "z97GFzn3pLPPq9iFFda2mMmB94LZrZmZfp";
-    let nStep = tagStep.deployContract;
+    const contractAddr = "zccYXdYmuk78c9iNQdayvsevhosQjkWBJG";
+    let nStep = tagStep.table_insert;
     // sTableName = sTableNameNew;
     //
     if (nStep != tagStep.active && nStep != tagStep.deployContract) {
