Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions e2e-network/docker/test-02-v2-raft-2orgs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ waitForContainer "orderer1.group1.orderer1.com" "Starting Raft node channel=my-c
waitForContainer "orderer2.group1.orderer1.com" "Starting Raft node channel=my-channel1"
waitForContainer "orderer2.group1.orderer1.com" "Starting Raft node channel=my-channel2"

waitForContainer "orderer0.group1.orderer1.com" "Created and started new channel my-channel1"
waitForContainer "orderer0.group1.orderer1.com" "Created and started new channel my-channel2"
waitForContainer "orderer0.group2.orderer2.com" "Created and started new channel my-channel3"

# check if org1 is ready
Expand All @@ -83,7 +85,7 @@ waitForContainer "peer1.org1.example.com" "Membership view has changed. peers we
waitForContainer "db.explorer.example.com" "database system is ready to accept connections" "200"
# // the next check is not working because explorer needs needs to be restarted first
# // see the issue: https://github.com/hyperledger-labs/fablo/issues/604
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
# waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"

# check if org2 is ready
waitForContainer "ca.org2.example.com" "Listening on https://0.0.0.0:7054"
Expand All @@ -99,8 +101,8 @@ waitForContainer "peer1.org2.example.com" "Membership view has changed. peers we
# check if chaincodes are instantiated on peers
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
waitForChaincode "peer0.org2.example.com" "my-channel1" "chaincode1" "0.0.1"
waitForChaincode "peer1.org1.example.com" "my-channel2" "chaincode2" "0.0.1"
waitForChaincode "peer1.org2.example.com" "my-channel2" "chaincode2" "0.0.1"
waitForChaincode "peer0.org1.example.com" "my-channel3" "chaincode2" "0.0.1"
waitForChaincode "peer1.org2.example.com" "my-channel3" "chaincode2" "0.0.1"

fablo_rest_org1="localhost:8802"

Expand All @@ -113,10 +115,10 @@ expectInvokeCli "peer0.org2.example.com" "my-channel1" "chaincode1" \
'{\"success\":\"Jack Sparrow\"}'

# invoke Java chaincode
expectInvokeRest "$fablo_rest_org1" "my-channel2" "chaincode2" \
expectInvokeRest "$fablo_rest_org1" "my-channel3" "chaincode2" \
"PokeballContract:createPokeball" '["id1", "Pokeball 1"]' \
'{"response":""}'
expectInvokeCli "peer1.org2.example.com" "my-channel2" "chaincode2" \
expectInvokeCli "peer1.org2.example.com" "my-channel3" "chaincode2" \
'{"Args":["PokeballContract:readPokeball", "id1"]}' \
'{\"value\":\"Pokeball 1\"}'

Expand Down
Loading
Loading