Merge branch 'main' into 111-post-start-hooks

Author: OsamaRab3

e2e-network/docker/test-02-v2-raft-2orgs.sh

@@ -98,6 +98,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
@@ -128,8 +130,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"
 
@@ -142,10 +144,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\"}'