diff --git a/fabcar/startFabric.sh b/fabcar/startFabric.sh index c839a203..028a0e11 100755 --- a/fabcar/startFabric.sh +++ b/fabcar/startFabric.sh @@ -66,19 +66,6 @@ docker exec \ -p "$CC_SRC_PATH" \ -l "$CC_RUNTIME_LANGUAGE" -echo "Installing smart contract on peer1.org1.example.com" -docker exec \ - -e CORE_PEER_LOCALMSPID=Org1MSP \ - -e CORE_PEER_ADDRESS=peer1.org1.example.com:8051 \ - -e CORE_PEER_MSPCONFIGPATH=${ORG1_MSPCONFIGPATH} \ - -e CORE_PEER_TLS_ROOTCERT_FILE=${ORG1_TLS_ROOTCERT_FILE} \ - cli \ - peer chaincode install \ - -n fabcar \ - -v 1.0 \ - -p "$CC_SRC_PATH" \ - -l "$CC_RUNTIME_LANGUAGE" - echo "Installing smart contract on peer0.org2.example.com" docker exec \ -e CORE_PEER_LOCALMSPID=Org2MSP \ @@ -92,19 +79,6 @@ docker exec \ -p "$CC_SRC_PATH" \ -l "$CC_RUNTIME_LANGUAGE" -echo "Installing smart contract on peer1.org2.example.com" -docker exec \ - -e CORE_PEER_LOCALMSPID=Org2MSP \ - -e CORE_PEER_ADDRESS=peer1.org2.example.com:10051 \ - -e CORE_PEER_MSPCONFIGPATH=${ORG2_MSPCONFIGPATH} \ - -e CORE_PEER_TLS_ROOTCERT_FILE=${ORG2_TLS_ROOTCERT_FILE} \ - cli \ - peer chaincode install \ - -n fabcar \ - -v 1.0 \ - -p "$CC_SRC_PATH" \ - -l "$CC_RUNTIME_LANGUAGE" - echo "Instantiating smart contract on mychannel" docker exec \ -e CORE_PEER_LOCALMSPID=Org1MSP \ @@ -127,7 +101,7 @@ echo "Waiting for instantiation request to be committed ..." sleep 10 echo "Submitting initLedger transaction to smart contract on mychannel" -echo "The transaction is sent to all of the peers so that chaincode is built before receiving the following requests" +echo "The transaction is sent to the two peers with the chaincode installed (peer0.org1.example.com and peer0.org2.example.com) so that chaincode is built before receiving the following requests" docker exec \ -e CORE_PEER_LOCALMSPID=Org1MSP \ -e CORE_PEER_MSPCONFIGPATH=${ORG1_MSPCONFIGPATH} \ @@ -141,12 +115,8 @@ docker exec \ --tls \ --cafile ${ORDERER_TLS_ROOTCERT_FILE} \ --peerAddresses peer0.org1.example.com:7051 \ - --peerAddresses peer1.org1.example.com:8051 \ --peerAddresses peer0.org2.example.com:9051 \ - --peerAddresses peer1.org2.example.com:10051 \ --tlsRootCertFiles ${ORG1_TLS_ROOTCERT_FILE} \ - --tlsRootCertFiles ${ORG1_TLS_ROOTCERT_FILE} \ - --tlsRootCertFiles ${ORG2_TLS_ROOTCERT_FILE} \ --tlsRootCertFiles ${ORG2_TLS_ROOTCERT_FILE} set +x