From 613d269f15a89cf9d5fef4923bf45b342931e8a1 Mon Sep 17 00:00:00 2001
From: Arnaud J Le Hors <lehors@us.ibm.com>
Date: Tue, 1 Dec 2020 14:30:46 +0100
Subject: [PATCH] Fix test-network chaincode packaging log (#383)

The chaincode packaging function wrongly implies that the packaging
operation is performed on a peer when it is in fact done locally.
This change fixes that.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
---
 test-network/scripts/deployCC.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test-network/scripts/deployCC.sh b/test-network/scripts/deployCC.sh
index edea87a6..03c3dd7d 100755
--- a/test-network/scripts/deployCC.sh
+++ b/test-network/scripts/deployCC.sh
@@ -141,15 +141,13 @@ fi
 . scripts/envVar.sh
 
 packageChaincode() {
-  ORG=$1
-  setGlobals $ORG
   set -x
   peer lifecycle chaincode package ${CC_NAME}.tar.gz --path ${CC_SRC_PATH} --lang ${CC_RUNTIME_LANGUAGE} --label ${CC_NAME}_${CC_VERSION} >&log.txt
   res=$?
   { set +x; } 2>/dev/null
   cat log.txt
-  verifyResult $res "Chaincode packaging on peer0.org${ORG} has failed"
-  successln "Chaincode is packaged on peer0.org${ORG}"
+  verifyResult $res "Chaincode packaging has failed"
+  successln "Chaincode is packaged"
 }
 
 # installChaincode PEER ORG
@@ -316,7 +314,7 @@ chaincodeQuery() {
 }
 
 ## package the chaincode
-packageChaincode 1
+packageChaincode
 
 ## Install chaincode on peer0.org1 and peer0.org2
 infoln "Installing chaincode on peer0.org1..."