diff --git a/first-network/byfn.sh b/first-network/byfn.sh index 46c417351e..c2aee3fb10 100755 --- a/first-network/byfn.sh +++ b/first-network/byfn.sh @@ -43,7 +43,7 @@ function printHelp () { echo " - 'restart' - restart the network" echo " - 'generate' - generate required certificates and genesis block" echo " -c - channel name to use (defaults to \"mychannel\")" - echo " -t - CLI timeout duration in microseconds (defaults to 10000)" + echo " -t - CLI timeout duration in seconds (defaults to 10000)" echo " -d - delay duration in seconds (defaults to 3)" echo " -f - specify which docker-compose file use (defaults to docker-compose-cli.yaml)" echo " -s - the database backend to use: goleveldb (default) or couchdb" @@ -353,9 +353,9 @@ fi if [ "${IF_COUCHDB}" == "couchdb" ]; then echo - echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}' using database '${IF_COUCHDB}'" + echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}' seconds and CLI delay of '${CLI_DELAY}' seconds and using database '${IF_COUCHDB}'" else - echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}'" + echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}' seconds and CLI delay of '${CLI_DELAY}' seconds" fi # ask for confirmation to proceed askProceed diff --git a/first-network/scripts/script.sh b/first-network/scripts/script.sh index 43a308ed3d..2d74e34a31 100755 --- a/first-network/scripts/script.sh +++ b/first-network/scripts/script.sh @@ -39,7 +39,6 @@ setGlobals () { CORE_PEER_ADDRESS=peer0.org1.example.com:7051 else CORE_PEER_ADDRESS=peer1.org1.example.com:7051 - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp fi else CORE_PEER_LOCALMSPID="Org2MSP" @@ -87,7 +86,7 @@ updateAnchorPeers() { echo } -## Sometimes Join takes time hence RETRY atleast for 5 times +## Sometimes Join takes time hence RETRY at least for 5 times joinWithRetry () { peer channel join -b $CHANNEL_NAME.block >&log.txt res=$?