add default expect for contract deploy

Mojicode · Mojicode · commit de5391c13753 · 2021-07-09T17:01:45.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chainsql",
-  "version": "0.70.8",
+  "version": "0.70.9",
   "description": "An database driver for chainsql ",
   "main": "src/index.js",
   "scripts": {
diff --git a/src/smartContract.js b/src/smartContract.js
@@ -718,12 +718,12 @@ Contract.prototype._executeMethod = function _executeMethod(){
             txCallbackProperty.callbackExpect = "send_success";
             if(args.options.isDeploy) {
                 sendTxPayment.ContractOpType = 1;
-                if (args.options.expect === "send_success")
+                if (args.options.hasOwnProperty("expect") && (args.options.expect === "send_success"))
                 {
                     errorMsg = "Contract deploy tx expect must be validate_success or db_success";
                     return errFuncGlobal(errorMsg, args.callback);
                 }
-                txCallbackProperty.callbackExpect = args.options.expect;
+                txCallbackProperty.callbackExpect = args.options.hasOwnProperty("expect") ? args.options.expect : "validate_success";
             }
             else {
                 sendTxPayment.ContractOpType = 2;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "chainsql",`
`3`		`- "version": "0.70.8",`
	`3`	`+ "version": "0.70.9",`
`4`	`4`	`"description": "An database driver for chainsql ",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -718,12 +718,12 @@ Contract.prototype._executeMethod = function _executeMethod(){`
`718`	`718`	`txCallbackProperty.callbackExpect = "send_success";`
`719`	`719`	`if(args.options.isDeploy) {`
`720`	`720`	`sendTxPayment.ContractOpType = 1;`
`721`		`- if (args.options.expect === "send_success")`
	`721`	`+ if (args.options.hasOwnProperty("expect") && (args.options.expect === "send_success"))`
`722`	`722`	`{`
`723`	`723`	`errorMsg = "Contract deploy tx expect must be validate_success or db_success";`
`724`	`724`	`return errFuncGlobal(errorMsg, args.callback);`
`725`	`725`	`}`
`726`		`- txCallbackProperty.callbackExpect = args.options.expect;`
	`726`	`+ txCallbackProperty.callbackExpect = args.options.hasOwnProperty("expect") ? args.options.expect : "validate_success";`
`727`	`727`	`}`
`728`	`728`	`else {`
`729`	`729`	`sendTxPayment.ContractOpType = 2;`