fix up

Signed-off-by: Sam Yuan <yy19902439@126.com>
hyperledger · Mar 30, 2024 · 1872c40 · 1872c40
1 parent d3e9d2f
commit 1872c40
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/test-network/scripts/configUpdate.sh b/test-network/scripts/configUpdate.sh
@@ -6,8 +6,8 @@
 #
 
 # import utils
-project_home=${project_home:-${PWD}}
-script_home=${project_home}/scripts
+test_network_home=${test_network_home:-${PWD}}
+script_home=${test_network_home}/scripts
 . ${script_home}/envVar.sh
 
 # fetchChannelConfig <org> <channel_id> <output_json>

diff --git a/test-network/scripts/envVar.sh b/test-network/scripts/envVar.sh
@@ -8,15 +8,15 @@
 # This is a collection of bash functions used by different scripts
 
 # imports
-project_home=${project_home:-${PWD}}
-script_home=${project_home}/scripts
+test_network_home=${test_network_home:-${PWD}}
+script_home=${test_network_home}/scripts
 . ${script_home}/utils.sh
 
 export CORE_PEER_TLS_ENABLED=true
-export ORDERER_CA=${project_home}/organizations/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
-export PEER0_ORG1_CA=${project_home}/organizations/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
-export PEER0_ORG2_CA=${project_home}/organizations/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
-export PEER0_ORG3_CA=${project_home}/organizations/peerOrganizations/org3.example.com/tlsca/tlsca.org3.example.com-cert.pem
+export ORDERER_CA=${test_network_home}/organizations/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
+export PEER0_ORG1_CA=${test_network_home}/organizations/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
+export PEER0_ORG2_CA=${test_network_home}/organizations/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
+export PEER0_ORG3_CA=${test_network_home}/organizations/peerOrganizations/org3.example.com/tlsca/tlsca.org3.example.com-cert.pem
 
 # Set environment variables for the peer org
 setGlobals() {
@@ -30,17 +30,17 @@ setGlobals() {
   if [ $USING_ORG -eq 1 ]; then
     export CORE_PEER_LOCALMSPID="Org1MSP"
     export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG1_CA
-    export CORE_PEER_MSPCONFIGPATH=${project_home}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp
+    export CORE_PEER_MSPCONFIGPATH=${test_network_home}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp
     export CORE_PEER_ADDRESS=localhost:7051
   elif [ $USING_ORG -eq 2 ]; then
     export CORE_PEER_LOCALMSPID="Org2MSP"
     export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG2_CA
-    export CORE_PEER_MSPCONFIGPATH=${project_home}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp
+    export CORE_PEER_MSPCONFIGPATH=${test_network_home}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp
     export CORE_PEER_ADDRESS=localhost:9051
   elif [ $USING_ORG -eq 3 ]; then
     export CORE_PEER_LOCALMSPID="Org3MSP"
     export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG3_CA
-    export CORE_PEER_MSPCONFIGPATH=${project_home}/organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp
+    export CORE_PEER_MSPCONFIGPATH=${test_network_home}/organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp
     export CORE_PEER_ADDRESS=localhost:11051
   else
     errorln "ORG Unknown"

diff --git a/test-network/scripts/org3-scripts/joinChannel.sh b/test-network/scripts/org3-scripts/joinChannel.sh
@@ -23,8 +23,8 @@ COUNTER=1
 MAX_RETRY=5
 
 # import environment variables
-export project_home=..
-. ${project_home}/scripts/envVar.sh
+export test_network_home=..
+. ${test_network_home}/scripts/envVar.sh
 
 # joinChannel ORG
 joinChannel() {

diff --git a/test-network/scripts/org3-scripts/updateChannelConfig.sh b/test-network/scripts/org3-scripts/updateChannelConfig.sh
@@ -23,8 +23,8 @@ MAX_RETRY=5
 
 
 # imports
-export project_home=..
-. ${project_home}/scripts/configUpdate.sh 
+export test_network_home=..
+. ${test_network_home}/scripts/configUpdate.sh 
 
 infoln "Creating config transaction to add org3 to network"