Skip to content

Commit 269d224

Browse files
OsamaRab3OsamaRab3
committed
fix issue test-04
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent aa34e68 commit 269d224

9 files changed

+18
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,8 +2522,8 @@ chaincodePackageCCaaS() {
25222522
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
25232523
inputLog "TLS_ENABLED: $TLS_ENABLED"
25242524
2525-
local CHANNEL_NAME=$9
2526-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2525+
# local CHANNEL_NAME=$9
2526+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
25272527
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
25282528
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
25292529

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2623,8 +2623,8 @@ chaincodePackageCCaaS() {
26232623
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
26242624
inputLog "TLS_ENABLED: $TLS_ENABLED"
26252625
2626-
local CHANNEL_NAME=$9
2627-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2626+
# local CHANNEL_NAME=$9
2627+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
26282628
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
26292629
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
26302630

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2590,8 +2590,8 @@ chaincodePackageCCaaS() {
25902590
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
25912591
inputLog "TLS_ENABLED: $TLS_ENABLED"
25922592
2593-
local CHANNEL_NAME=$9
2594-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2593+
# local CHANNEL_NAME=$9
2594+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
25952595
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
25962596
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
25972597

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3539,8 +3539,8 @@ chaincodePackageCCaaS() {
35393539
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
35403540
inputLog "TLS_ENABLED: $TLS_ENABLED"
35413541
3542-
local CHANNEL_NAME=$9
3543-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
3542+
# local CHANNEL_NAME=$9
3543+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
35443544
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
35453545
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
35463546

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5434,8 +5434,8 @@ chaincodePackageCCaaS() {
54345434
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
54355435
inputLog "TLS_ENABLED: $TLS_ENABLED"
54365436
5437-
local CHANNEL_NAME=$9
5438-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
5437+
# local CHANNEL_NAME=$9
5438+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
54395439
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
54405440
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
54415441

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6005,8 +6005,8 @@ chaincodePackageCCaaS() {
60056005
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
60066006
inputLog "TLS_ENABLED: $TLS_ENABLED"
60076007
6008-
local CHANNEL_NAME=$9
6009-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
6008+
# local CHANNEL_NAME=$9
6009+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
60106010
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
60116011
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
60126012

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2965,8 +2965,8 @@ chaincodePackageCCaaS() {
29652965
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
29662966
inputLog "TLS_ENABLED: $TLS_ENABLED"
29672967
2968-
local CHANNEL_NAME=$9
2969-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2968+
# local CHANNEL_NAME=$9
2969+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
29702970
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
29712971
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
29722972

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2989,8 +2989,8 @@ chaincodePackageCCaaS() {
29892989
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
29902990
inputLog "TLS_ENABLED: $TLS_ENABLED"
29912991
2992-
local CHANNEL_NAME=$9
2993-
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}_\${CHAINCODE_NAME}"
2992+
# local CHANNEL_NAME=$9
2993+
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
29942994
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
29952995
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
29962996

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ chaincodePackageCCaaS() {
121121
inputLog "TLS_ENABLED: $TLS_ENABLED"
122122

123123

124-
local CHANNEL_NAME=$9
125-
local ACTUAL_CONTAINER_NAME="ccaas-${PEER_ADDRESS%%:*}-${CHANNEL_NAME}_${CHAINCODE_NAME}"
124+
# local CHANNEL_NAME=$9
125+
local ACTUAL_CONTAINER_NAME="ccaas-${PEER_ADDRESS%%:*}-${CHAINCODE_NAME}"
126126
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
127127
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"
128128

0 commit comments

Comments
 (0)