Skip to content

Commit 98307e6

Browse files
committed
Update snapshots
Signed-off-by: Jakub Dzikowski <jakub.t.dzikowski@gmail.com>
1 parent 0e706b9 commit 98307e6

8 files changed

+54
-186
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,6 @@ chaincodeList() {
15621562
peerChaincodeList "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" # $2 is channel name
15631563
15641564
else
1565-
15661565
echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
15671566
exit 1
15681567
@@ -1648,10 +1647,7 @@ channelQuery() {
16481647
16491648
peerChannelList "cli.org1.example.com" "peer0.org1.example.com:7041"
16501649
1651-
elif
1652-
1653-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
1654-
then
1650+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then
16551651
16561652
peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041"
16571653
@@ -1667,7 +1663,6 @@ channelQuery() {
16671663
peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "$TARGET_FILE"
16681664
16691665
else
1670-
16711666
echo "$@"
16721667
echo "$1, $2, $3, $4, $5, $6, $7, $#"
16731668
printChannelsHelp

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,14 +1568,11 @@ chaincodeList() {
15681568
15691569
peerChaincodeList "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" # $2 is channel name
15701570
1571-
elif
1572-
[ "$1" = "peer1.org1.example.com" ]
1573-
then
1571+
elif [ "$1" = "peer1.org1.example.com" ]; then
15741572
15751573
peerChaincodeList "cli.org1.example.com" "peer1.org1.example.com:7042" "$2" # $2 is channel name
15761574
15771575
else
1578-
15791576
echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
15801577
exit 1
15811578
@@ -1670,16 +1667,11 @@ channelQuery() {
16701667
16711668
peerChannelList "cli.org1.example.com" "peer0.org1.example.com:7041"
16721669
1673-
elif
1674-
[ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]
1675-
then
1670+
elif [ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]; then
16761671
16771672
peerChannelList "cli.org1.example.com" "peer1.org1.example.com:7042"
16781673
1679-
elif
1680-
1681-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
1682-
then
1674+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then
16831675
16841676
peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041"
16851677
@@ -1694,9 +1686,7 @@ channelQuery() {
16941686
16951687
peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "$TARGET_FILE"
16961688
1697-
elif
1698-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
1699-
then
1689+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then
17001690
17011691
peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer1.org1.example.com:7042"
17021692
@@ -1712,7 +1702,6 @@ channelQuery() {
17121702
peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7042" "$TARGET_FILE"
17131703
17141704
else
1715-
17161705
echo "$@"
17171706
echo "$1, $2, $3, $4, $5, $6, $7, $#"
17181707
printChannelsHelp

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,6 @@ chaincodeList() {
16471647
peerChaincodeListTls "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" "crypto-orderer/tlsca.orderer.example.com-cert.pem" # Third argument is channel name
16481648
16491649
else
1650-
16511650
echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
16521651
exit 1
16531652
@@ -1769,10 +1768,7 @@ channelQuery() {
17691768
17701769
peerChannelListTls "cli.org1.example.com" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
17711770
1772-
elif
1773-
1774-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
1775-
then
1771+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then
17761772
17771773
peerChannelGetInfoTls "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
17781774
@@ -1787,9 +1783,7 @@ channelQuery() {
17871783
17881784
peerChannelFetchBlockTls "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "$TARGET_FILE"
17891785
1790-
elif
1791-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
1792-
then
1786+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then
17931787
17941788
peerChannelGetInfoTls "my-channel2" "cli.org1.example.com" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
17951789
@@ -1805,7 +1799,6 @@ channelQuery() {
18051799
peerChannelFetchBlockTls "my-channel2" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "$TARGET_FILE"
18061800
18071801
else
1808-
18091802
echo "$@"
18101803
echo "$1, $2, $3, $4, $5, $6, $7, $#"
18111804
printChannelsHelp

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

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,20 +2251,15 @@ chaincodeList() {
22512251
22522252
peerChaincodeList "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" # $2 is channel name
22532253
2254-
elif
2255-
[ "$1" = "peer1.org1.example.com" ]
2256-
then
2254+
elif [ "$1" = "peer1.org1.example.com" ]; then
22572255
22582256
peerChaincodeList "cli.org1.example.com" "peer1.org1.example.com:7042" "$2" # $2 is channel name
22592257
2260-
elif
2261-
[ "$1" = "peer0.org2.example.com" ]
2262-
then
2258+
elif [ "$1" = "peer0.org2.example.com" ]; then
22632259
22642260
peerChaincodeList "cli.org2.example.com" "peer0.org2.example.com:7061" "$2" # $2 is channel name
22652261
22662262
else
2267-
22682263
echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
22692264
exit 1
22702265
@@ -2368,22 +2363,15 @@ channelQuery() {
23682363
23692364
peerChannelList "cli.org1.example.com" "peer0.org1.example.com:7041"
23702365
2371-
elif
2372-
[ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]
2373-
then
2366+
elif [ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]; then
23742367
23752368
peerChannelList "cli.org1.example.com" "peer1.org1.example.com:7042"
23762369
2377-
elif
2378-
[ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]
2379-
then
2370+
elif [ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]; then
23802371
23812372
peerChannelList "cli.org2.example.com" "peer0.org2.example.com:7061"
23822373
2383-
elif
2384-
2385-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
2386-
then
2374+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then
23872375
23882376
peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041"
23892377
@@ -2398,9 +2386,7 @@ channelQuery() {
23982386
23992387
peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "$TARGET_FILE"
24002388
2401-
elif
2402-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
2403-
then
2389+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then
24042390
24052391
peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer1.org1.example.com:7042"
24062392
@@ -2415,9 +2401,7 @@ channelQuery() {
24152401
24162402
peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7042" "$TARGET_FILE"
24172403
2418-
elif
2419-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]
2420-
then
2404+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]; then
24212405
24222406
peerChannelGetInfo "my-channel1" "cli.org2.example.com" "peer0.org2.example.com:7061"
24232407
@@ -2433,7 +2417,6 @@ channelQuery() {
24332417
peerChannelFetchBlock "my-channel1" "cli.org2.example.com" "\${BLOCK_NAME}" "peer0.org2.example.com:7061" "$TARGET_FILE"
24342418
24352419
else
2436-
24372420
echo "$@"
24382421
echo "$1, $2, $3, $4, $5, $6, $7, $#"
24392422
printChannelsHelp

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

Lines changed: 14 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3623,26 +3623,19 @@ chaincodeList() {
36233623
36243624
peerChaincodeListTls "cli.org1.example.com" "peer0.org1.example.com:7061" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name
36253625
3626-
elif
3627-
[ "$1" = "peer1.org1.example.com" ]
3628-
then
3626+
elif [ "$1" = "peer1.org1.example.com" ]; then
36293627
36303628
peerChaincodeListTls "cli.org1.example.com" "peer1.org1.example.com:7062" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name
36313629
3632-
elif
3633-
[ "$1" = "peer0.org2.example.com" ]
3634-
then
3630+
elif [ "$1" = "peer0.org2.example.com" ]; then
36353631
36363632
peerChaincodeListTls "cli.org2.example.com" "peer0.org2.example.com:7081" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name
36373633
3638-
elif
3639-
[ "$1" = "peer1.org2.example.com" ]
3640-
then
3634+
elif [ "$1" = "peer1.org2.example.com" ]; then
36413635
36423636
peerChaincodeListTls "cli.org2.example.com" "peer1.org2.example.com:7082" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name
36433637
36443638
else
3645-
36463639
echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
36473640
exit 1
36483641
@@ -3806,28 +3799,19 @@ channelQuery() {
38063799
38073800
peerChannelListTls "cli.org1.example.com" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38083801
3809-
elif
3810-
[ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]
3811-
then
3802+
elif [ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]; then
38123803
38133804
peerChannelListTls "cli.org1.example.com" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38143805
3815-
elif
3816-
[ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]
3817-
then
3806+
elif [ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]; then
38183807
38193808
peerChannelListTls "cli.org2.example.com" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38203809
3821-
elif
3822-
[ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer1" ]
3823-
then
3810+
elif [ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer1" ]; then
38243811
38253812
peerChannelListTls "cli.org2.example.com" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38263813
3827-
elif
3828-
3829-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
3830-
then
3814+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then
38313815
38323816
peerChannelGetInfoTls "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38333817
@@ -3842,9 +3826,7 @@ channelQuery() {
38423826
38433827
peerChannelFetchBlockTls "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"
38443828
3845-
elif
3846-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]
3847-
then
3829+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]; then
38483830
38493831
peerChannelGetInfoTls "my-channel1" "cli.org2.example.com" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38503832
@@ -3859,9 +3841,7 @@ channelQuery() {
38593841
38603842
peerChannelFetchBlockTls "my-channel1" "cli.org2.example.com" "\${BLOCK_NAME}" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"
38613843
3862-
elif
3863-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
3864-
then
3844+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then
38653845
38663846
peerChannelGetInfoTls "my-channel2" "cli.org1.example.com" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38673847
@@ -3876,9 +3856,7 @@ channelQuery() {
38763856
38773857
peerChannelFetchBlockTls "my-channel2" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"
38783858
3879-
elif
3880-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]
3881-
then
3859+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]; then
38823860
38833861
peerChannelGetInfoTls "my-channel2" "cli.org2.example.com" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer1.com-cert.pem"
38843862
@@ -3893,9 +3871,7 @@ channelQuery() {
38933871
38943872
peerChannelFetchBlockTls "my-channel2" "cli.org2.example.com" "\${BLOCK_NAME}" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"
38953873
3896-
elif
3897-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
3898-
then
3874+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then
38993875
39003876
peerChannelGetInfoTls "my-channel3" "cli.org1.example.com" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer2.com-cert.pem"
39013877
@@ -3910,9 +3886,7 @@ channelQuery() {
39103886
39113887
peerChannelFetchBlockTls "my-channel3" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"
39123888
3913-
elif
3914-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
3915-
then
3889+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then
39163890
39173891
peerChannelGetInfoTls "my-channel3" "cli.org1.example.com" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer2.com-cert.pem"
39183892
@@ -3927,9 +3901,7 @@ channelQuery() {
39273901
39283902
peerChannelFetchBlockTls "my-channel3" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"
39293903
3930-
elif
3931-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]
3932-
then
3904+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]; then
39333905
39343906
peerChannelGetInfoTls "my-channel3" "cli.org2.example.com" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer2.com-cert.pem"
39353907
@@ -3944,9 +3916,7 @@ channelQuery() {
39443916
39453917
peerChannelFetchBlockTls "my-channel3" "cli.org2.example.com" "\${BLOCK_NAME}" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"
39463918
3947-
elif
3948-
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]
3949-
then
3919+
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]; then
39503920
39513921
peerChannelGetInfoTls "my-channel3" "cli.org2.example.com" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer2.com-cert.pem"
39523922
@@ -3962,7 +3932,6 @@ channelQuery() {
39623932
peerChannelFetchBlockTls "my-channel3" "cli.org2.example.com" "\${BLOCK_NAME}" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"
39633933
39643934
else
3965-
39663935
echo "$@"
39673936
echo "$1, $2, $3, $4, $5, $6, $7, $#"
39683937
printChannelsHelp

0 commit comments

Comments
 (0)