Skip to content

Commit aa34e68

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

8 files changed

+56
-40
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,13 +2573,15 @@ chaincodeInstall() {
25732573
local PEER_ADDRESS=$2
25742574
local CHAINCODE_NAME=$3
25752575
local CHAINCODE_VERSION=$4
2576-
local CHANNEL_NAME=$5
2577-
local CA_CERT=$6
2578-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2576+
local CHANNEL_NAME=\${6:-my-channel}
2577+
local CA_CERT=\${5:-}
2578+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
25792579
25802580
echo "Installing chaincode $CHAINCODE_NAME..."
25812581
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
25822582
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
2583+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
2584+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
25832585
inputLog "CA_CERT: $CA_CERT"
25842586
25852587
local CA_CERT_PARAMS=()
@@ -2675,7 +2677,7 @@ chaincodeApprove() {
26752677
local CHANNEL_NAME="$3"
26762678
local CHAINCODE_NAME=$4
26772679
local CHAINCODE_VERSION=$5
2678-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2680+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26792681
local ORDERER_URL=$6
26802682
local ENDORSEMENT=$7
26812683
local INIT_REQUIRED=$8
@@ -2761,7 +2763,7 @@ chaincodeCommit() {
27612763
local CHANNEL_NAME="$3"
27622764
local CHAINCODE_NAME=$4
27632765
local CHAINCODE_VERSION=$5
2764-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2766+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
27652767
local ORDERER_URL=$6
27662768
local ENDORSEMENT=$7
27672769
local INIT_REQUIRED=$8

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2674,13 +2674,15 @@ chaincodeInstall() {
26742674
local PEER_ADDRESS=$2
26752675
local CHAINCODE_NAME=$3
26762676
local CHAINCODE_VERSION=$4
2677-
local CHANNEL_NAME=$5
2678-
local CA_CERT=$6
2679-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2677+
local CHANNEL_NAME=\${6:-my-channel}
2678+
local CA_CERT=\${5:-}
2679+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26802680
26812681
echo "Installing chaincode $CHAINCODE_NAME..."
26822682
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
26832683
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
2684+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
2685+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
26842686
inputLog "CA_CERT: $CA_CERT"
26852687
26862688
local CA_CERT_PARAMS=()
@@ -2776,7 +2778,7 @@ chaincodeApprove() {
27762778
local CHANNEL_NAME="$3"
27772779
local CHAINCODE_NAME=$4
27782780
local CHAINCODE_VERSION=$5
2779-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2781+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
27802782
local ORDERER_URL=$6
27812783
local ENDORSEMENT=$7
27822784
local INIT_REQUIRED=$8
@@ -2862,7 +2864,7 @@ chaincodeCommit() {
28622864
local CHANNEL_NAME="$3"
28632865
local CHAINCODE_NAME=$4
28642866
local CHAINCODE_VERSION=$5
2865-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2867+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
28662868
local ORDERER_URL=$6
28672869
local ENDORSEMENT=$7
28682870
local INIT_REQUIRED=$8

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,13 +2641,15 @@ chaincodeInstall() {
26412641
local PEER_ADDRESS=$2
26422642
local CHAINCODE_NAME=$3
26432643
local CHAINCODE_VERSION=$4
2644-
local CHANNEL_NAME=$5
2645-
local CA_CERT=$6
2646-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2644+
local CHANNEL_NAME=\${6:-my-channel}
2645+
local CA_CERT=\${5:-}
2646+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
26472647
26482648
echo "Installing chaincode $CHAINCODE_NAME..."
26492649
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
26502650
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
2651+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
2652+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
26512653
inputLog "CA_CERT: $CA_CERT"
26522654
26532655
local CA_CERT_PARAMS=()
@@ -2743,7 +2745,7 @@ chaincodeApprove() {
27432745
local CHANNEL_NAME="$3"
27442746
local CHAINCODE_NAME=$4
27452747
local CHAINCODE_VERSION=$5
2746-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2748+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
27472749
local ORDERER_URL=$6
27482750
local ENDORSEMENT=$7
27492751
local INIT_REQUIRED=$8
@@ -2829,7 +2831,7 @@ chaincodeCommit() {
28292831
local CHANNEL_NAME="$3"
28302832
local CHAINCODE_NAME=$4
28312833
local CHAINCODE_VERSION=$5
2832-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
2834+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
28332835
local ORDERER_URL=$6
28342836
local ENDORSEMENT=$7
28352837
local INIT_REQUIRED=$8

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3590,13 +3590,15 @@ chaincodeInstall() {
35903590
local PEER_ADDRESS=$2
35913591
local CHAINCODE_NAME=$3
35923592
local CHAINCODE_VERSION=$4
3593-
local CHANNEL_NAME=$5
3594-
local CA_CERT=$6
3595-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3593+
local CHANNEL_NAME=\${6:-my-channel}
3594+
local CA_CERT=\${5:-}
3595+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
35963596
35973597
echo "Installing chaincode $CHAINCODE_NAME..."
35983598
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
35993599
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
3600+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
3601+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
36003602
inputLog "CA_CERT: $CA_CERT"
36013603
36023604
local CA_CERT_PARAMS=()
@@ -3692,7 +3694,7 @@ chaincodeApprove() {
36923694
local CHANNEL_NAME="$3"
36933695
local CHAINCODE_NAME=$4
36943696
local CHAINCODE_VERSION=$5
3695-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3697+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
36963698
local ORDERER_URL=$6
36973699
local ENDORSEMENT=$7
36983700
local INIT_REQUIRED=$8
@@ -3778,7 +3780,7 @@ chaincodeCommit() {
37783780
local CHANNEL_NAME="$3"
37793781
local CHAINCODE_NAME=$4
37803782
local CHAINCODE_VERSION=$5
3781-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3783+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
37823784
local ORDERER_URL=$6
37833785
local ENDORSEMENT=$7
37843786
local INIT_REQUIRED=$8

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5485,13 +5485,15 @@ chaincodeInstall() {
54855485
local PEER_ADDRESS=$2
54865486
local CHAINCODE_NAME=$3
54875487
local CHAINCODE_VERSION=$4
5488-
local CHANNEL_NAME=$5
5489-
local CA_CERT=$6
5490-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
5488+
local CHANNEL_NAME=\${6:-my-channel}
5489+
local CA_CERT=\${5:-}
5490+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
54915491
54925492
echo "Installing chaincode $CHAINCODE_NAME..."
54935493
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
54945494
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
5495+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
5496+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
54955497
inputLog "CA_CERT: $CA_CERT"
54965498
54975499
local CA_CERT_PARAMS=()
@@ -5587,7 +5589,7 @@ chaincodeApprove() {
55875589
local CHANNEL_NAME="$3"
55885590
local CHAINCODE_NAME=$4
55895591
local CHAINCODE_VERSION=$5
5590-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
5592+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
55915593
local ORDERER_URL=$6
55925594
local ENDORSEMENT=$7
55935595
local INIT_REQUIRED=$8
@@ -5673,7 +5675,7 @@ chaincodeCommit() {
56735675
local CHANNEL_NAME="$3"
56745676
local CHAINCODE_NAME=$4
56755677
local CHAINCODE_VERSION=$5
5676-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
5678+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
56775679
local ORDERER_URL=$6
56785680
local ENDORSEMENT=$7
56795681
local INIT_REQUIRED=$8

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6056,13 +6056,15 @@ chaincodeInstall() {
60566056
local PEER_ADDRESS=$2
60576057
local CHAINCODE_NAME=$3
60586058
local CHAINCODE_VERSION=$4
6059-
local CHANNEL_NAME=$5
6060-
local CA_CERT=$6
6061-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
6059+
local CHANNEL_NAME=\${6:-my-channel}
6060+
local CA_CERT=\${5:-}
6061+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
60626062
60636063
echo "Installing chaincode $CHAINCODE_NAME..."
60646064
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
60656065
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
6066+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
6067+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
60666068
inputLog "CA_CERT: $CA_CERT"
60676069
60686070
local CA_CERT_PARAMS=()
@@ -6158,7 +6160,7 @@ chaincodeApprove() {
61586160
local CHANNEL_NAME="$3"
61596161
local CHAINCODE_NAME=$4
61606162
local CHAINCODE_VERSION=$5
6161-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
6163+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
61626164
local ORDERER_URL=$6
61636165
local ENDORSEMENT=$7
61646166
local INIT_REQUIRED=$8
@@ -6244,7 +6246,7 @@ chaincodeCommit() {
62446246
local CHANNEL_NAME="$3"
62456247
local CHAINCODE_NAME=$4
62466248
local CHAINCODE_VERSION=$5
6247-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
6249+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
62486250
local ORDERER_URL=$6
62496251
local ENDORSEMENT=$7
62506252
local INIT_REQUIRED=$8

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3016,13 +3016,15 @@ chaincodeInstall() {
30163016
local PEER_ADDRESS=$2
30173017
local CHAINCODE_NAME=$3
30183018
local CHAINCODE_VERSION=$4
3019-
local CHANNEL_NAME=$5
3020-
local CA_CERT=$6
3021-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3019+
local CHANNEL_NAME=\${6:-my-channel}
3020+
local CA_CERT=\${5:-}
3021+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
30223022
30233023
echo "Installing chaincode $CHAINCODE_NAME..."
30243024
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
30253025
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
3026+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
3027+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
30263028
inputLog "CA_CERT: $CA_CERT"
30273029
30283030
local CA_CERT_PARAMS=()
@@ -3118,7 +3120,7 @@ chaincodeApprove() {
31183120
local CHANNEL_NAME="$3"
31193121
local CHAINCODE_NAME=$4
31203122
local CHAINCODE_VERSION=$5
3121-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3123+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
31223124
local ORDERER_URL=$6
31233125
local ENDORSEMENT=$7
31243126
local INIT_REQUIRED=$8
@@ -3204,7 +3206,7 @@ chaincodeCommit() {
32043206
local CHANNEL_NAME="$3"
32053207
local CHAINCODE_NAME=$4
32063208
local CHAINCODE_VERSION=$5
3207-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3209+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
32083210
local ORDERER_URL=$6
32093211
local ENDORSEMENT=$7
32103212
local INIT_REQUIRED=$8

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,13 +3040,15 @@ chaincodeInstall() {
30403040
local PEER_ADDRESS=$2
30413041
local CHAINCODE_NAME=$3
30423042
local CHAINCODE_VERSION=$4
3043-
local CHANNEL_NAME=$5
3044-
local CA_CERT=$6
3045-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3043+
local CHANNEL_NAME=\${6:-my-channel}
3044+
local CA_CERT=\${5:-}
3045+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
30463046
30473047
echo "Installing chaincode $CHAINCODE_NAME..."
30483048
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
30493049
inputLog "PEER_ADDRESS: $PEER_ADDRESS"
3050+
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
3051+
inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
30503052
inputLog "CA_CERT: $CA_CERT"
30513053
30523054
local CA_CERT_PARAMS=()
@@ -3142,7 +3144,7 @@ chaincodeApprove() {
31423144
local CHANNEL_NAME="$3"
31433145
local CHAINCODE_NAME=$4
31443146
local CHAINCODE_VERSION=$5
3145-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3147+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
31463148
local ORDERER_URL=$6
31473149
local ENDORSEMENT=$7
31483150
local INIT_REQUIRED=$8
@@ -3228,7 +3230,7 @@ chaincodeCommit() {
32283230
local CHANNEL_NAME="$3"
32293231
local CHAINCODE_NAME=$4
32303232
local CHAINCODE_VERSION=$5
3231-
local CHAINCODE_LABEL="\${CHANNEL_NAME}_\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
3233+
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
32323234
local ORDERER_URL=$6
32333235
local ENDORSEMENT=$7
32343236
local INIT_REQUIRED=$8

0 commit comments

Comments
 (0)