diff --git a/hyperledger_fabric/1.0.4/Makefile b/hyperledger_fabric/1.0.4/Makefile index 6d4a6041..4f80b5ee 100644 --- a/hyperledger_fabric/1.0.4/Makefile +++ b/hyperledger_fabric/1.0.4/Makefile @@ -32,14 +32,16 @@ init: # initialize the fabric network @echo "In DEV mode, wait for rebuilding ..." && sleep $(CODE_BUILD_WAIT); \ make init_peer0; \ else \ - echo "In Normal mode ..." && sleep 3; \ + echo "In Normal mode ..." && sleep 1; \ make init_all; \ + fi test_cc: # test chaincode if [ "$(HLF_MODE)" = "dev" ]; then \ make test_cc_peer0; \ else \ make test_cc_all; \ + fi ready: restart @echo "Restart, init network and then do cc testing..." diff --git a/hyperledger_fabric/1.0.4/scripts/func.sh b/hyperledger_fabric/1.0.4/scripts/func.sh index 5270294b..f8b46e49 100644 --- a/hyperledger_fabric/1.0.4/scripts/func.sh +++ b/hyperledger_fabric/1.0.4/scripts/func.sh @@ -20,7 +20,6 @@ elif [ -f scripts/variables.sh ]; then source scripts/variables.sh fi - # Verify $1 is not 0, then output error msg $2 verifyResult () { if [ $1 -ne 0 ] ; then