updated some conditions

Signed-off-by: Sanket Teli <telisanket2002@gmail.com>
Sanket-0510 · Oct 25, 2024 · bb1d407 · bb1d407
1 parent a99c65e
commit bb1d407
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/e2e-network/docker/test-05.sh b/e2e-network/docker/test-05.sh
diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh
@@ -155,11 +155,7 @@ upgradeChaincode() {
   <% chaincodes.forEach((chaincode) => { -%>
     if [ "$chaincodeName" = "<%= chaincode.name %>" ]; then
       if [ -n "$(ls "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>")" ]; then
-        <% if (global.capabilities.isV2) { -%>
-          <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); %>
-        <% } else { -%>
-          <%- include('commands-generated/chaincode-upgrade-v2.sh', { chaincode, global }); %>
-        <% } -%>
+        <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); %>
       else
         echo "Warning! Skipping chaincode '<%= chaincode.name %>' upgrade. Chaincode directory is empty."
         echo "Looked in dir: '$CHAINCODES_BASE_DIR/<%= chaincode.directory %>'"

diff --git a/src/setup-docker/templates/fabric-docker/docker-compose.yaml b/src/setup-docker/templates/fabric-docker/docker-compose.yaml
@@ -209,6 +209,7 @@ services:
       - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt
       - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key
       - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
+      - ORDERER_ADMIN_LISTENADDRESS=<%= orderer.address %>:7053
       <%_ } _%>
     working_dir: /var/hyperledger/orderer
     command: orderer

diff --git a/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns.sh b/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns.sh
@@ -22,8 +22,7 @@ createChannelAndJoin() {
   mkdir "$DIR_NAME" && cd "$DIR_NAME"
 
   <% if(global.capabilities.isV3) { %>
-  cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
-  }
+  cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
   <% } else { %>
   cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
   <% } %>