Skip to content

Commit 51c13f5

Browse files
committed
fix
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent 269d224 commit 51c13f5

9 files changed

+27
-27
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,7 +2573,7 @@ chaincodeInstall() {
25732573
local PEER_ADDRESS=$2
25742574
local CHAINCODE_NAME=$3
25752575
local CHAINCODE_VERSION=$4
2576-
local CHANNEL_NAME=\${6:-my-channel}
2576+
# local CHANNEL_NAME=\${6:-my-channel}
25772577
local CA_CERT=\${5:-}
25782578
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25792579
@@ -2602,8 +2602,8 @@ startCCaaSContainer() {
26022602
local EXTERNAL_PORT="$5"
26032603
local CLI_NAME="$6"
26042604
local CA_CERT="$7"
2605-
local CHANNEL_NAME="$8"
2606-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2605+
# local CHANNEL_NAME="$8"
2606+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
26072607
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
26082608
26092609
# Query installed chaincodes to get the package ID

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2674,7 +2674,7 @@ chaincodeInstall() {
26742674
local PEER_ADDRESS=$2
26752675
local CHAINCODE_NAME=$3
26762676
local CHAINCODE_VERSION=$4
2677-
local CHANNEL_NAME=\${6:-my-channel}
2677+
# local CHANNEL_NAME=\${6:-my-channel}
26782678
local CA_CERT=\${5:-}
26792679
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26802680
@@ -2703,8 +2703,8 @@ startCCaaSContainer() {
27032703
local EXTERNAL_PORT="$5"
27042704
local CLI_NAME="$6"
27052705
local CA_CERT="$7"
2706-
local CHANNEL_NAME="$8"
2707-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2706+
# local CHANNEL_NAME="$8"
2707+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
27082708
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
27092709
27102710
# Query installed chaincodes to get the package ID

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,7 +2641,7 @@ chaincodeInstall() {
26412641
local PEER_ADDRESS=$2
26422642
local CHAINCODE_NAME=$3
26432643
local CHAINCODE_VERSION=$4
2644-
local CHANNEL_NAME=\${6:-my-channel}
2644+
# local CHANNEL_NAME=\${6:-my-channel}
26452645
local CA_CERT=\${5:-}
26462646
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26472647
@@ -2670,8 +2670,8 @@ startCCaaSContainer() {
26702670
local EXTERNAL_PORT="$5"
26712671
local CLI_NAME="$6"
26722672
local CA_CERT="$7"
2673-
local CHANNEL_NAME="$8"
2674-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2673+
# local CHANNEL_NAME="$8"
2674+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
26752675
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
26762676
26772677
# Query installed chaincodes to get the package ID

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3590,7 +3590,7 @@ chaincodeInstall() {
35903590
local PEER_ADDRESS=$2
35913591
local CHAINCODE_NAME=$3
35923592
local CHAINCODE_VERSION=$4
3593-
local CHANNEL_NAME=\${6:-my-channel}
3593+
# local CHANNEL_NAME=\${6:-my-channel}
35943594
local CA_CERT=\${5:-}
35953595
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
35963596
@@ -3619,8 +3619,8 @@ startCCaaSContainer() {
36193619
local EXTERNAL_PORT="$5"
36203620
local CLI_NAME="$6"
36213621
local CA_CERT="$7"
3622-
local CHANNEL_NAME="$8"
3623-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
3622+
# local CHANNEL_NAME="$8"
3623+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
36243624
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
36253625
36263626
# Query installed chaincodes to get the package ID

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5485,7 +5485,7 @@ chaincodeInstall() {
54855485
local PEER_ADDRESS=$2
54865486
local CHAINCODE_NAME=$3
54875487
local CHAINCODE_VERSION=$4
5488-
local CHANNEL_NAME=\${6:-my-channel}
5488+
# local CHANNEL_NAME=\${6:-my-channel}
54895489
local CA_CERT=\${5:-}
54905490
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
54915491
@@ -5514,8 +5514,8 @@ startCCaaSContainer() {
55145514
local EXTERNAL_PORT="$5"
55155515
local CLI_NAME="$6"
55165516
local CA_CERT="$7"
5517-
local CHANNEL_NAME="$8"
5518-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
5517+
# local CHANNEL_NAME="$8"
5518+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
55195519
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
55205520
55215521
# Query installed chaincodes to get the package ID

e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6056,7 +6056,7 @@ chaincodeInstall() {
60566056
local PEER_ADDRESS=$2
60576057
local CHAINCODE_NAME=$3
60586058
local CHAINCODE_VERSION=$4
6059-
local CHANNEL_NAME=\${6:-my-channel}
6059+
# local CHANNEL_NAME=\${6:-my-channel}
60606060
local CA_CERT=\${5:-}
60616061
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
60626062
@@ -6085,8 +6085,8 @@ startCCaaSContainer() {
60856085
local EXTERNAL_PORT="$5"
60866086
local CLI_NAME="$6"
60876087
local CA_CERT="$7"
6088-
local CHANNEL_NAME="$8"
6089-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
6088+
# local CHANNEL_NAME="$8"
6089+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
60906090
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
60916091
60926092
# Query installed chaincodes to get the package ID

e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3016,7 +3016,7 @@ chaincodeInstall() {
30163016
local PEER_ADDRESS=$2
30173017
local CHAINCODE_NAME=$3
30183018
local CHAINCODE_VERSION=$4
3019-
local CHANNEL_NAME=\${6:-my-channel}
3019+
# local CHANNEL_NAME=\${6:-my-channel}
30203020
local CA_CERT=\${5:-}
30213021
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
30223022
@@ -3045,8 +3045,8 @@ startCCaaSContainer() {
30453045
local EXTERNAL_PORT="$5"
30463046
local CLI_NAME="$6"
30473047
local CA_CERT="$7"
3048-
local CHANNEL_NAME="$8"
3049-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
3048+
# local CHANNEL_NAME="$8"
3049+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
30503050
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
30513051
30523052
# Query installed chaincodes to get the package ID

e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,7 +3040,7 @@ chaincodeInstall() {
30403040
local PEER_ADDRESS=$2
30413041
local CHAINCODE_NAME=$3
30423042
local CHAINCODE_VERSION=$4
3043-
local CHANNEL_NAME=\${6:-my-channel}
3043+
# local CHANNEL_NAME=\${6:-my-channel}
30443044
local CA_CERT=\${5:-}
30453045
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
30463046
@@ -3069,8 +3069,8 @@ startCCaaSContainer() {
30693069
local EXTERNAL_PORT="$5"
30703070
local CLI_NAME="$6"
30713071
local CA_CERT="$7"
3072-
local CHANNEL_NAME="$8"
3073-
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
3072+
# local CHANNEL_NAME="$8"
3073+
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
30743074
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
30753075
30763076
# Query installed chaincodes to get the package ID

src/setup-docker/templates/fabric-docker/scripts/chaincode-functions-v2.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ chaincodeInstall() {
172172
local PEER_ADDRESS=$2
173173
local CHAINCODE_NAME=$3
174174
local CHAINCODE_VERSION=$4
175-
local CHANNEL_NAME=${6:-my-channel}
175+
# local CHANNEL_NAME=${6:-my-channel}
176176
local CA_CERT=${5:-}
177177
local CHAINCODE_LABEL="${CHAINCODE_NAME}_$CHAINCODE_VERSION"
178178

@@ -201,8 +201,8 @@ startCCaaSContainer() {
201201
local EXTERNAL_PORT="$5"
202202
local CLI_NAME="$6"
203203
local CA_CERT="$7"
204-
local CHANNEL_NAME="$8"
205-
local CONTAINER_NAME="ccaas-${PEER_ADDRESS%%:*}-${CHANNEL_NAME}_${CHAINCODE_NAME}"
204+
# local CHANNEL_NAME="$8"
205+
local CONTAINER_NAME="ccaas-${PEER_ADDRESS%%:*}-${CHAINCODE_NAME}"
206206
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
207207

208208
# Query installed chaincodes to get the package ID

0 commit comments

Comments
 (0)