Skip to content

Commit a921b44

Browse files
OsamaRab3OsamaRab3
committed
update snaps
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent e5cd930 commit a921b44

8 files changed

+33
-132
lines changed

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,6 @@ chaincodePackageCCaaS() {
25852585
local CONTAINER_NAME=$7
25862586
local TLS_ENABLED=$8
25872587
local CHANNEL_NAME=$9
2588-
local ORG_DOMAIN=\${10}
25892588
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25902589
25912590
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2597,7 +2596,6 @@ chaincodePackageCCaaS() {
25972596
inputLog "TLS_ENABLED: $TLS_ENABLED"
25982597
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
25992598
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2600-
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
26012599
26022600
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
26032601
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2610,7 +2608,7 @@ chaincodePackageCCaaS() {
26102608
26112609
if [ "$TLS_ENABLED" = true ]; then
26122610
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2613-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
2611+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
26142612
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
26152613
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
26162614
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,7 +1793,6 @@ installChannels() {
17931793
17941794
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
17951795
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/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
1796-
17971796
}
17981797
17991798
installChaincodes() {
@@ -2645,7 +2644,6 @@ chaincodePackageCCaaS() {
26452644
local CONTAINER_NAME=$7
26462645
local TLS_ENABLED=$8
26472646
local CHANNEL_NAME=$9
2648-
local ORG_DOMAIN=\${10}
26492647
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26502648
26512649
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2657,7 +2655,6 @@ chaincodePackageCCaaS() {
26572655
inputLog "TLS_ENABLED: $TLS_ENABLED"
26582656
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
26592657
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2660-
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
26612658
26622659
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
26632660
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2670,7 +2667,7 @@ chaincodePackageCCaaS() {
26702667
26712668
if [ "$TLS_ENABLED" = true ]; then
26722669
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2673-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
2670+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
26742671
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
26752672
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
26762673
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

‎e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,21 +1678,12 @@ chaincodeInvoke() {
16781678
peer_certs="$1"
16791679
peer_certs="\${peer_certs//peer0.org1.example.com/crypto/peers/peer0.org1.example.com/tls/ca.crt}"
16801680
1681-
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
1682-
local ca_cert=""
1683-
16841681
if [ "$2" = "my-channel1" ]; then
16851682
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
16861683
fi
16871684
if [ "$2" = "my-channel2" ]; then
16881685
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
16891686
fi
1690-
1691-
if [ -z "$ca_cert" ]; then
1692-
echo "Error: Channel '$2' not found or is not associated with an orderer group."
1693-
exit 1
1694-
fi
1695-
16961687
peerChaincodeInvokeTls "$cli" "$peer_addresses" "$2" "$3" "$4" "$5" "$peer_certs" "$ca_cert"
16971688
}
16981689
@@ -1734,20 +1725,14 @@ chaincodeQuery() {
17341725
exit 1
17351726
fi
17361727
1737-
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
1738-
local ca_cert=""
1739-
1740-
if [ "$2" = "my-channel1" ]; then
1728+
if [ "$channel_name" = "my-channel1" ]; then
17411729
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
17421730
fi
1743-
if [ "$2" = "my-channel2" ]; then
1731+
1732+
if [ "$channel_name" = "my-channel2" ]; then
17441733
ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
17451734
fi
17461735
1747-
if [ -z "$ca_cert" ]; then
1748-
echo "Error: Channel '$2' not found or is not associated with an orderer group."
1749-
exit 1
1750-
fi
17511736
peerChaincodeQueryTls "$cli" "$peer_address" "$channel_name" "$chaincode_name" "$command" "$transient" "$peer_cert" "$ca_cert"
17521737
17531738
}
@@ -1892,7 +1877,7 @@ installChaincodes() {
18921877
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
18931878
local version="0.0.1"
18941879
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1895-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1" "org1.example.com"
1880+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1"
18961881
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
18971882
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
18981883
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel1_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1"
@@ -1906,7 +1891,7 @@ installChaincodes() {
19061891
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19071892
local version="0.0.1"
19081893
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1909-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2" "org1.example.com"
1894+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2"
19101895
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19111896
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19121897
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel2_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1"
@@ -1936,7 +1921,7 @@ installChaincode() {
19361921
if [ "$chaincodeName" = "chaincode1" ]; then
19371922
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19381923
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1939-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1" "org1.example.com"
1924+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1"
19401925
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19411926
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19421927
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel1_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1"
@@ -1952,7 +1937,7 @@ installChaincode() {
19521937
if [ "$chaincodeName" = "chaincode1" ]; then
19531938
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19541939
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1955-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2" "org1.example.com"
1940+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2"
19561941
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19571942
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19581943
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel2_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1"
@@ -1988,7 +1973,7 @@ upgradeChaincode() {
19881973
if [ "$chaincodeName" = "chaincode1" ]; then
19891974
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
19901975
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1991-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1" "org1.example.com"
1976+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "true" "my-channel1"
19921977
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
19931978
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
19941979
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel1_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1"
@@ -2004,7 +1989,7 @@ upgradeChaincode() {
20041989
if [ "$chaincodeName" = "chaincode1" ]; then
20051990
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
20061991
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
2007-
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2" "org1.example.com"
1992+
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "true" "my-channel2"
20081993
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
20091994
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel2" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
20101995
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "my-channel2_chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "27041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1"
@@ -2829,7 +2814,6 @@ chaincodePackageCCaaS() {
28292814
local CONTAINER_NAME=$7
28302815
local TLS_ENABLED=$8
28312816
local CHANNEL_NAME=$9
2832-
local ORG_DOMAIN=\${10}
28332817
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
28342818
28352819
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -2841,7 +2825,6 @@ chaincodePackageCCaaS() {
28412825
inputLog "TLS_ENABLED: $TLS_ENABLED"
28422826
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
28432827
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
2844-
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
28452828
28462829
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
28472830
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -2854,7 +2837,7 @@ chaincodePackageCCaaS() {
28542837
28552838
if [ "$TLS_ENABLED" = true ]; then
28562839
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
2857-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
2840+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
28582841
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
28592842
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
28602843
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2533,7 +2533,6 @@ installChannels() {
25332533
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/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
25342534
printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638"
25352535
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/Admin@org2.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
2536-
25372536
}
25382537
25392538
installChaincodes() {
@@ -3600,7 +3599,6 @@ chaincodePackageCCaaS() {
36003599
local CONTAINER_NAME=$7
36013600
local TLS_ENABLED=$8
36023601
local CHANNEL_NAME=$9
3603-
local ORG_DOMAIN=\${10}
36043602
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
36053603
36063604
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -3612,7 +3610,6 @@ chaincodePackageCCaaS() {
36123610
inputLog "TLS_ENABLED: $TLS_ENABLED"
36133611
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
36143612
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
3615-
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
36163613
36173614
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
36183615
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -3625,7 +3622,7 @@ chaincodePackageCCaaS() {
36253622
36263623
if [ "$TLS_ENABLED" = true ]; then
36273624
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
3628-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
3625+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
36293626
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
36303627
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
36313628
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

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

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ chaincodes:
8282
hooks:
8383
# changes MaxMessageCount to 1
8484
postGenerate: "perl -i -pe 's/MaxMessageCount: 10/MaxMessageCount: 1/g' \\"./fablo-target/fabric-config/configtx.yaml\\""
85+
postStart: "echo 'Network started' && docker ps --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}' > ./fablo-target/container-list-$(date +%Y%m%d_%H%M%S).log 2>&1 && echo 'Container list saved into fablo-target directory'"
86+
8587
"
8688
`;
8789

@@ -3687,24 +3689,15 @@ chaincodeInvoke() {
36873689
peer_certs="\${peer_certs//peer0.org2.example.com/crypto/peers/peer0.org2.example.com/tls/ca.crt}"
36883690
peer_certs="\${peer_certs//peer1.org2.example.com/crypto/peers/peer1.org2.example.com/tls/ca.crt}"
36893691
3690-
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
3691-
local ca_cert=""
3692-
36933692
if [ "$2" = "my-channel1" ]; then
36943693
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
36953694
fi
36963695
if [ "$2" = "my-channel2" ]; then
36973696
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
36983697
fi
36993698
if [ "$2" = "my-channel3" ]; then
3700-
ca_cert="crypto-orderer/tlsca.orderer2.com-cert.pem"
3701-
fi
3702-
3703-
if [ -z "$ca_cert" ]; then
3704-
echo "Error: Channel '$2' not found or is not associated with an orderer group."
3705-
exit 1
3699+
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
37063700
fi
3707-
37083701
peerChaincodeInvokeTls "$cli" "$peer_addresses" "$2" "$3" "$4" "$5" "$peer_certs" "$ca_cert"
37093702
}
37103703
@@ -3767,23 +3760,18 @@ chaincodeQuery() {
37673760
exit 1
37683761
fi
37693762
3770-
# Initialize ca_cert to prevent using an uninitialized variable if the channel isn't found
3771-
local ca_cert=""
3772-
3773-
if [ "$2" = "my-channel1" ]; then
3763+
if [ "$channel_name" = "my-channel1" ]; then
37743764
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
37753765
fi
3776-
if [ "$2" = "my-channel2" ]; then
3766+
3767+
if [ "$channel_name" = "my-channel2" ]; then
37773768
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
37783769
fi
3779-
if [ "$2" = "my-channel3" ]; then
3780-
ca_cert="crypto-orderer/tlsca.orderer2.com-cert.pem"
3781-
fi
37823770
3783-
if [ -z "$ca_cert" ]; then
3784-
echo "Error: Channel '$2' not found or is not associated with an orderer group."
3785-
exit 1
3771+
if [ "$channel_name" = "my-channel3" ]; then
3772+
ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
37863773
fi
3774+
37873775
peerChaincodeQueryTls "$cli" "$peer_address" "$channel_name" "$chaincode_name" "$command" "$transient" "$peer_cert" "$ca_cert"
37883776
37893777
}
@@ -4137,9 +4125,6 @@ installChannels() {
41374125
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/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
41384126
printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
41394127
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/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
4140-
4141-
echo "Restarting global Explorer: explorer.example.com"
4142-
docker restart explorer.example.com || true
41434128
}
41444129
41454130
installChaincodes() {
@@ -5556,7 +5541,6 @@ chaincodePackageCCaaS() {
55565541
local CONTAINER_NAME=$7
55575542
local TLS_ENABLED=$8
55585543
local CHANNEL_NAME=$9
5559-
local ORG_DOMAIN=\${10}
55605544
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
55615545
55625546
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
@@ -5568,7 +5552,6 @@ chaincodePackageCCaaS() {
55685552
inputLog "TLS_ENABLED: $TLS_ENABLED"
55695553
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
55705554
inputLog "CONTAINER_NAME: $CONTAINER_NAME"
5571-
inputLog "ORG_DOMAIN: $ORG_DOMAIN"
55725555
55735556
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
55745557
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
@@ -5581,7 +5564,7 @@ chaincodePackageCCaaS() {
55815564
55825565
if [ "$TLS_ENABLED" = true ]; then
55835566
# Use peer0.org1.example.com TLS certificates instead of CCaaS certificates
5584-
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/$ORG_DOMAIN/peers/$PEER_ADDRESS/tls"
5567+
local PEER_TLS_PATH="$FABLO_NETWORK_ROOT/fabric-config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls"
55855568
local ROOT_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/ca.crt")
55865569
local SERVER_CERT=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.crt")
55875570
local SERVER_KEY=$(awk '{printf "%s\\\\n", $0}' "$PEER_TLS_PATH/server.key")

0 commit comments

Comments
 (0)