Merge pull request #139 from nearprotocol/inspect-response

Use inspectResponse to display nearcore responses

index.js

@@ -71,7 +71,7 @@ exports.viewAccount = async function(options) {
     let account = await near.account(options.accountId);
     let state = await account.state();
     console.log(`Account ${options.accountId}`);
-    console.log(state);
+    console.log(inspectResponse(state));
 }
 
 exports.deleteAccount = async function(options) {
@@ -95,7 +95,7 @@ exports.txStatus = async function(options) {
     let near = await connect(options);
     let status = await near.connection.provider.txStatus(bs58.decode(options.hash));
     console.log(`Transaction ${options.hash}`);
-    console.log(status);
+    console.log(inspectResponse(status));
 }
 
 exports.deploy = async function(options) {
@@ -114,30 +114,30 @@ exports.scheduleFunctionCall = async function(options) {
     const account = await near.account(options.accountId);
     const functionCallResponse = await account.functionCall(options.contractName, options.methodName, JSON.parse(options.args || '{}'), options.amount);
     const result = nearjs.providers.getTransactionLastResult(functionCallResponse);
-    console.log('Result:', result);
+    console.log(inspectResponse(result));
 };
 
 exports.sendMoney = async function(options) {
     console.log(`Sending ${options.amount} NEAR to ${options.receiver} from ${options.sender}`);
     const near = await connect(options);
     const account = await near.account(options.sender);
-    await account.sendMoney(options.receiver, options.amount);
+    console.log(inspectResponse(await account.sendMoney(options.receiver, options.amount)));
 };
 
 exports.callViewFunction = async function(options) {
     console.log(`View call: ${options.contractName}.${options.methodName}(${options.args || ''})`);
     const near = await connect(options);
     // TODO: Figure out how to run readonly calls without account
     const account = await near.account(options.accountId || options.masterAccount || 'register.near');
-    console.log('Result:', await account.viewFunction(options.contractName, options.methodName, JSON.parse(options.args || '{}')));
+    console.log(inspectResponse(await account.viewFunction(options.contractName, options.methodName, JSON.parse(options.args || '{}'))));
 };
 
 exports.stake = async function(options) {
     console.log(`Staking ${options.amount} on ${options.accountId} with public key = ${options.publicKey}.`);
     const near = await connect(options);
     const account = await near.account(options.accountId);
     const result = await account.stake(options.publicKey, BigInt(options.amount));
-    console.log('Result: ', JSON.stringify(result));
+    console.log(inspectResponse(result));
 }
 
 exports.login = async function(options) {

package.json

@@ -21,7 +21,9 @@
   "bin": {
     "near": "./bin/near"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "strip-ansi-cli": "^2.0.0"
+  },
   "dependencies": {
     "assemblyscript": "github:nearprotocol/assemblyscript",
     "bs58": "^4.0.1",

test/index.sh

@@ -1,5 +1,15 @@
 #!/bin/bash
-set -ex
-./test/new_project.sh
-./test/account_operations.sh
-#./test/contract_tests.sh
+OVERALL_RESULT=0
+for test in ./test/test_*; do
+    echo ""
+    echo "Running $test"
+    "$test"
+    if [ $? -ne 0 ]; then 
+        echo "$test FAIL"
+        OVERALL_RESULT=1
+    else
+        echo "$test SUCCESS"
+    fi
+done
+
+exit $OVERALL_RESULT

test/account_operations.sh → test/test_account_operations.sh

@@ -1,14 +1,18 @@
 #!/bin/bash
 set -ex
+rm  -rf tmp-project
+./bin/near new_project 'tmp-project'
 cd tmp-project
 timestamp=$(date +%s)
 testaccount=testaccount$timestamp
 echo Create account
 ../bin/near create_account $testaccount
 
 echo Get account state
-RESULT=$(../bin/near state $testaccount)
-if [[ $RESULT != *"Account $testaccount"*"amount: '100000000'"* ]]; then
+RESULT=$(../bin/near state $testaccount | strip-ansi)
+echo $RESULT
+EXPECTED=".+Account $testaccount.+amount:.+'100000000'.+ "
+if [[ ! "$RESULT" =~ $EXPECTED ]]; then
     echo FAILURE Unexpected output from near state
     exit 1
 fi

test/contract_tests.sh → test/test_contract.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 set -ex
+rm  -rf tmp-project
+./bin/near new_project 'tmp-project'
 cd tmp-project
 rm  -rf assembly
 mkdir assembly

test/new_project.sh → test/test_new_project.sh

@@ -13,9 +13,9 @@ yarn remove near-shell
 yarn add ../
 yarn test
 cd ..
-rm  -rf tmp-project
 
 # test generating new project in new dir
+rm  -rf tmp-project
 ./bin/near new_project 'tmp-project'
 cd tmp-project
 FILE=package.json