Fix: Restart Explorer once channels are created (#615)

Author: OsamaRab3

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

@@ -83,7 +83,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"

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

@@ -1734,6 +1734,7 @@ installChannels() {
 
   printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
   docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/[email protected]/msp' 'orderer0.group1.orderer.example.com:7030';"
+
 }
 
 installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap

@@ -2471,6 +2471,7 @@ installChannels() {
   docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/[email protected]/msp' 'orderer0.group1.orderer.example.com:7030';"
   printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638"
   docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/[email protected]/msp' 'orderer0.group1.orderer.example.com:7030';"
+
 }
 
 installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap

@@ -4038,6 +4038,9 @@ installChannels() {
   docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7081' 'crypto/users/[email protected]/msp' 'crypto/users/[email protected]/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
   printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
   docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7082' 'crypto/users/[email protected]/msp' 'crypto/users/[email protected]/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
+
+  echo "Restarting global Explorer: explorer.example.com"
+  docker restart explorer.example.com || true
 }
 
 installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap

@@ -4474,6 +4474,9 @@ installChannels() {
   docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/[email protected]/msp' 'crypto/users/[email protected]/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
   printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
   docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7062' 'crypto/users/[email protected]/msp' 'crypto/users/[email protected]/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
+
+  echo "Restarting global Explorer: explorer.example.com"
+  docker restart explorer.example.com || true
 }
 
 installChaincodes() {

e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap

@@ -1947,6 +1947,7 @@ installChannels() {
 
   printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
   docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/[email protected]/msp' 'crypto/users/[email protected]/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
+
 }
 
 installChaincodes() {

e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap

@@ -1971,6 +1971,7 @@ installChannels() {
 
   printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
   docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/[email protected]/msp' 'crypto/users/[email protected]/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
+
 }
 
 installChaincodes() {

src/setup-docker/templates/fabric-docker/commands-generated.sh

@@ -106,6 +106,17 @@ installChannels() {
       <% }) -%>
     <% }) -%>
   <% } -%>
+  
+  <% if (global.tools.explorer) { -%>
+    echo "Restarting global Explorer: <%= global.tools.explorer.address %>"
+    docker restart <%= global.tools.explorer.address %> || true
+  <% } -%>
+  <% orgs.forEach((org) => { -%>
+    <% if (org.tools.explorer && !global.tools.explorer) { -%>
+      echo "Restarting org Explorer: <%= org.tools.explorer.address %>"
+      docker restart <%= org.tools.explorer.address %> || true
+    <% } -%>
+  <% }) -%>
 }
 
 installChaincodes() {