Skip to content

Commit 33a32df

Browse files
OsamaRab3OsamaRab3
committed
simplifi duplicate item and update chaincode label
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent 269d224 commit 33a32df

11 files changed

+223
-167
lines changed

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,8 +1695,9 @@ installChaincode() {
16951695
if [ -n "$(ls "$CHAINCODES_BASE_DIR/./chaincodes/chaincode-kv-node")" ]; then
16961696
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
16971697
chaincodeBuild "chaincode1" "node" "$CHAINCODES_BASE_DIR/./chaincodes/chaincode-kv-node" "16"
1698-
chaincodePackage "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "node" printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
1699-
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" ""
1698+
chaincodePackage "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "node" "my-channel1"
1699+
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
1700+
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" ""
17001701
chaincodeApprove "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "" "false" "" "" "node" ""
17011702
printItalics "Committing chaincode 'chaincode1' on channel 'my-channel1' as 'Org1'" "U1F618"
17021703
chaincodeCommit "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "" "false" "" "peer0.org1.example.com:7041" "" ""
@@ -1742,8 +1743,9 @@ upgradeChaincode() {
17421743
if [ -n "$(ls "$CHAINCODES_BASE_DIR/./chaincodes/chaincode-kv-node")" ]; then
17431744
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
17441745
chaincodeBuild "chaincode1" "node" "$CHAINCODES_BASE_DIR/./chaincodes/chaincode-kv-node" "16"
1745-
chaincodePackage "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "node" printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
1746-
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" ""
1746+
chaincodePackage "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "node" "my-channel1"
1747+
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
1748+
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" ""
17471749
chaincodeApprove "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "" "false" "" "" "node" ""
17481750
printItalics "Committing chaincode 'chaincode1' on channel 'my-channel1' as 'Org1'" "U1F618"
17491751
chaincodeCommit "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "" "false" "" "peer0.org1.example.com:7041" "" ""
@@ -2484,8 +2486,9 @@ chaincodePackage() {
24842486
local PEER_ADDRESS=$2
24852487
local CHAINCODE_NAME=$3
24862488
local CHAINCODE_VERSION=$4
2487-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
24882489
local CHAINCODE_LANG=$5
2490+
local CHANNEL_NAME=$6
2491+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
24892492
24902493
echo "Packaging chaincode $CHAINCODE_NAME..."
24912494
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
@@ -2508,11 +2511,12 @@ chaincodePackageCCaaS() {
25082511
local PEER_ADDRESS=$2
25092512
local CHAINCODE_NAME=$3
25102513
local CHAINCODE_VERSION=$4
2511-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25122514
local CHAINCODE_IMAGE=$5
25132515
local CONTAINER_PORT=$6
25142516
local CONTAINER_NAME=$7
25152517
local TLS_ENABLED=$8
2518+
local CHANNEL_NAME=$9
2519+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25162520
25172521
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
25182522
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
@@ -2522,8 +2526,7 @@ chaincodePackageCCaaS() {
25222526
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
25232527
inputLog "TLS_ENABLED: $TLS_ENABLED"
25242528
2525-
# local CHANNEL_NAME=$9
2526-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
2529+
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
25272530
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
25282531
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
25292532
@@ -2573,9 +2576,9 @@ chaincodeInstall() {
25732576
local PEER_ADDRESS=$2
25742577
local CHAINCODE_NAME=$3
25752578
local CHAINCODE_VERSION=$4
2576-
local CHANNEL_NAME=\${6:-my-channel}
2577-
local CA_CERT=\${5:-}
2578-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2579+
local CHANNEL_NAME=$5
2580+
local CA_CERT=\${6:-}
2581+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25792582
25802583
echo "Installing chaincode $CHAINCODE_NAME..."
25812584
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
@@ -2602,8 +2605,7 @@ startCCaaSContainer() {
26022605
local EXTERNAL_PORT="$5"
26032606
local CLI_NAME="$6"
26042607
local CA_CERT="$7"
2605-
local CHANNEL_NAME="$8"
2606-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2608+
local CONTAINER_NAME="$8"
26072609
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
26082610
26092611
# Query installed chaincodes to get the package ID
@@ -2677,7 +2679,7 @@ chaincodeApprove() {
26772679
local CHANNEL_NAME="$3"
26782680
local CHAINCODE_NAME=$4
26792681
local CHAINCODE_VERSION=$5
2680-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2682+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26812683
local ORDERER_URL=$6
26822684
local ENDORSEMENT=$7
26832685
local INIT_REQUIRED=$8
@@ -2763,7 +2765,7 @@ chaincodeCommit() {
27632765
local CHANNEL_NAME="$3"
27642766
local CHAINCODE_NAME=$4
27652767
local CHAINCODE_VERSION=$5
2766-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2768+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
27672769
local ORDERER_URL=$6
27682770
local ENDORSEMENT=$7
27692771
local INIT_REQUIRED=$8

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,10 +1734,10 @@ installChaincodes() {
17341734
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
17351735
local version="0.0.1"
17361736
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1737-
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" "true"
1737+
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" "true" "my-channel1"
17381738
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
1739-
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
1740-
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "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"
1739+
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
1740+
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"
17411741
chaincodeApprove "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "AND ('Org1MSP.member')" "" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "" "ccaas" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0"
17421742
printItalics "Committing chaincode 'chaincode1' on channel 'my-channel1' as 'Org1'" "U1F618"
17431743
chaincodeCommit "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "AND ('Org1MSP.member')" "" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "peer0.org1.example.com:7041" "crypto-peer/peer0.org1.example.com/tls/ca.crt" ""
@@ -1764,10 +1764,10 @@ installChaincode() {
17641764
if [ "$chaincodeName" = "chaincode1" ]; then
17651765
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
17661766
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1767-
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" "true"
1767+
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" "true" "my-channel1"
17681768
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
1769-
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
1770-
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "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"
1769+
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
1770+
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"
17711771
chaincodeApprove "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "AND ('Org1MSP.member')" "" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "" "ccaas" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0"
17721772
printItalics "Committing chaincode 'chaincode1' on channel 'my-channel1' as 'Org1'" "U1F618"
17731773
chaincodeCommit "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "AND ('Org1MSP.member')" "" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "peer0.org1.example.com:7041" "crypto-peer/peer0.org1.example.com/tls/ca.crt" ""
@@ -1800,10 +1800,10 @@ upgradeChaincode() {
18001800
if [ "$chaincodeName" = "chaincode1" ]; then
18011801
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
18021802
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
1803-
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" "true"
1803+
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" "true" "my-channel1"
18041804
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
1805-
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
1806-
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "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"
1805+
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "my-channel1" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
1806+
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"
18071807
chaincodeApprove "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "AND ('Org1MSP.member')" "" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "" "ccaas" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0"
18081808
printItalics "Committing chaincode 'chaincode1' on channel 'my-channel1' as 'Org1'" "U1F618"
18091809
chaincodeCommit "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "$version" "orderer0.group1.orderer.example.com:7030" "AND ('Org1MSP.member')" "" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "peer0.org1.example.com:7041" "crypto-peer/peer0.org1.example.com/tls/ca.crt" ""
@@ -2585,8 +2585,9 @@ chaincodePackage() {
25852585
local PEER_ADDRESS=$2
25862586
local CHAINCODE_NAME=$3
25872587
local CHAINCODE_VERSION=$4
2588-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25892588
local CHAINCODE_LANG=$5
2589+
local CHANNEL_NAME=$6
2590+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25902591
25912592
echo "Packaging chaincode $CHAINCODE_NAME..."
25922593
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
@@ -2609,11 +2610,12 @@ chaincodePackageCCaaS() {
26092610
local PEER_ADDRESS=$2
26102611
local CHAINCODE_NAME=$3
26112612
local CHAINCODE_VERSION=$4
2612-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26132613
local CHAINCODE_IMAGE=$5
26142614
local CONTAINER_PORT=$6
26152615
local CONTAINER_NAME=$7
26162616
local TLS_ENABLED=$8
2617+
local CHANNEL_NAME=$9
2618+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26172619
26182620
echo "Packaging CCaaS chaincode $CHAINCODE_NAME..."
26192621
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
@@ -2623,8 +2625,7 @@ chaincodePackageCCaaS() {
26232625
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
26242626
inputLog "TLS_ENABLED: $TLS_ENABLED"
26252627
2626-
# local CHANNEL_NAME=$9
2627-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
2628+
local ACTUAL_CONTAINER_NAME="$CONTAINER_NAME"
26282629
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
26292630
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
26302631
@@ -2674,9 +2675,9 @@ chaincodeInstall() {
26742675
local PEER_ADDRESS=$2
26752676
local CHAINCODE_NAME=$3
26762677
local CHAINCODE_VERSION=$4
2677-
local CHANNEL_NAME=\${6:-my-channel}
2678-
local CA_CERT=\${5:-}
2679-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2678+
local CHANNEL_NAME=$5
2679+
local CA_CERT=\${6:-}
2680+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26802681
26812682
echo "Installing chaincode $CHAINCODE_NAME..."
26822683
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
@@ -2703,8 +2704,7 @@ startCCaaSContainer() {
27032704
local EXTERNAL_PORT="$5"
27042705
local CLI_NAME="$6"
27052706
local CA_CERT="$7"
2706-
local CHANNEL_NAME="$8"
2707-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2707+
local CONTAINER_NAME="$8"
27082708
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
27092709
27102710
# Query installed chaincodes to get the package ID
@@ -2778,7 +2778,7 @@ chaincodeApprove() {
27782778
local CHANNEL_NAME="$3"
27792779
local CHAINCODE_NAME=$4
27802780
local CHAINCODE_VERSION=$5
2781-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2781+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
27822782
local ORDERER_URL=$6
27832783
local ENDORSEMENT=$7
27842784
local INIT_REQUIRED=$8
@@ -2864,7 +2864,7 @@ chaincodeCommit() {
28642864
local CHANNEL_NAME="$3"
28652865
local CHAINCODE_NAME=$4
28662866
local CHAINCODE_VERSION=$5
2867-
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2867+
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
28682868
local ORDERER_URL=$6
28692869
local ENDORSEMENT=$7
28702870
local INIT_REQUIRED=$8

0 commit comments

Comments
 (0)