Skip to content

Commit 711f7f0

Browse files
Sanket-0510Sanket-0510
committed
updated the snapshots
Signed-off-by: Sanket Teli <telisanket2002@gmail.com>
1 parent cbf301f commit 711f7f0

6 files changed

+14
-66
lines changed

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,11 +1544,9 @@ FABRIC_CA_POSTGRES_VERSION=14
15441544
FABRIC_CCENV_VERSION=2.3.3
15451545
FABRIC_BASEOS_VERSION=2.3.3
15461546
1547-
1548-
FABRIC_JAVAENV_VERSION=3.0-beta
1549-
FABRIC_NODEENV_VERSION=2.5
1550-
RECOMMENDED_NODE_VERSION=18
1551-
1547+
FABRIC_JAVAENV_VERSION=2.3
1548+
FABRIC_NODEENV_VERSION=2.3
1549+
RECOMMENDED_NODE_VERSION=12
15521550
15531551
ROOT_CA_ADMIN_NAME=admin
15541552
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -1718,7 +1716,6 @@ generateChannelsArtifacts() {
17181716
}
17191717
17201718
installChannels() {
1721-
set -x
17221719
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
17231720
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
17241721
@@ -2283,7 +2280,6 @@ createChannelTx() {
22832280
22842281
createNewChannelUpdateTx() {
22852282
local CONTAINER_NAME=createAnchorPeerUpdateTx
2286-
22872283
local CHANNEL_NAME=$1
22882284
local MSP_NAME=$2
22892285
local CONFIG_PROFILE=$3
@@ -3058,11 +3054,9 @@ set -eu
30583054
30593055
createChannelAndJoin() {
30603056
local CHANNEL_NAME=$1
3061-
30623057
local CORE_PEER_LOCALMSPID=$2
30633058
local CORE_PEER_ADDRESS=$3
30643059
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
3065-
30663060
local ORDERER_URL=$5
30673061
30683062
local DIR_NAME=step-createChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -3084,7 +3078,6 @@ createChannelAndJoin() {
30843078
30853079
createChannelAndJoinTls() {
30863080
local CHANNEL_NAME=$1
3087-
30883081
local CORE_PEER_LOCALMSPID=$2
30893082
local CORE_PEER_ADDRESS=$3
30903083
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
@@ -3120,11 +3113,9 @@ createChannelAndJoinTls() {
31203113
31213114
fetchChannelAndJoin() {
31223115
local CHANNEL_NAME=$1
3123-
31243116
local CORE_PEER_LOCALMSPID=$2
31253117
local CORE_PEER_ADDRESS=$3
31263118
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
3127-
31283119
local ORDERER_URL=$5
31293120
31303121
local DIR_NAME=step-fetchChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -3145,7 +3136,6 @@ fetchChannelAndJoin() {
31453136
31463137
fetchChannelAndJoinTls() {
31473138
local CHANNEL_NAME=$1
3148-
31493139
local CORE_PEER_LOCALMSPID=$2
31503140
local CORE_PEER_ADDRESS=$3
31513141
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,11 +1455,9 @@ FABRIC_CA_POSTGRES_VERSION=14
14551455
FABRIC_CCENV_VERSION=2.5.9
14561456
FABRIC_BASEOS_VERSION=2.5.9
14571457
1458-
1459-
FABRIC_JAVAENV_VERSION=3.0-beta
1458+
FABRIC_JAVAENV_VERSION=2.5
14601459
FABRIC_NODEENV_VERSION=2.5
1461-
RECOMMENDED_NODE_VERSION=18
1462-
1460+
RECOMMENDED_NODE_VERSION=16
14631461
14641462
ROOT_CA_ADMIN_NAME=admin
14651463
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -1669,7 +1667,6 @@ generateChannelsArtifacts() {
16691667
}
16701668
16711669
installChannels() {
1672-
set -x
16731670
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
16741671
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
16751672
@@ -2151,7 +2148,6 @@ createChannelTx() {
21512148
21522149
createNewChannelUpdateTx() {
21532150
local CONTAINER_NAME=createAnchorPeerUpdateTx
2154-
21552151
local CHANNEL_NAME=$1
21562152
local MSP_NAME=$2
21572153
local CONFIG_PROFILE=$3
@@ -2926,11 +2922,9 @@ set -eu
29262922
29272923
createChannelAndJoin() {
29282924
local CHANNEL_NAME=$1
2929-
29302925
local CORE_PEER_LOCALMSPID=$2
29312926
local CORE_PEER_ADDRESS=$3
29322927
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
2933-
29342928
local ORDERER_URL=$5
29352929
29362930
local DIR_NAME=step-createChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -2952,7 +2946,6 @@ createChannelAndJoin() {
29522946
29532947
createChannelAndJoinTls() {
29542948
local CHANNEL_NAME=$1
2955-
29562949
local CORE_PEER_LOCALMSPID=$2
29572950
local CORE_PEER_ADDRESS=$3
29582951
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
@@ -2988,11 +2981,9 @@ createChannelAndJoinTls() {
29882981
29892982
fetchChannelAndJoin() {
29902983
local CHANNEL_NAME=$1
2991-
29922984
local CORE_PEER_LOCALMSPID=$2
29932985
local CORE_PEER_ADDRESS=$3
29942986
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
2995-
29962987
local ORDERER_URL=$5
29972988
29982989
local DIR_NAME=step-fetchChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -3013,7 +3004,6 @@ fetchChannelAndJoin() {
30133004
30143005
fetchChannelAndJoinTls() {
30153006
local CHANNEL_NAME=$1
3016-
30173007
local CORE_PEER_LOCALMSPID=$2
30183008
local CORE_PEER_ADDRESS=$3
30193009
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,11 +2116,9 @@ FABRIC_CA_POSTGRES_VERSION=14
21162116
FABRIC_CCENV_VERSION=2.4.7
21172117
FABRIC_BASEOS_VERSION=2.4.7
21182118
2119-
2120-
FABRIC_JAVAENV_VERSION=3.0-beta
2121-
FABRIC_NODEENV_VERSION=2.5
2122-
RECOMMENDED_NODE_VERSION=18
2123-
2119+
FABRIC_JAVAENV_VERSION=2.4
2120+
FABRIC_NODEENV_VERSION=2.4
2121+
RECOMMENDED_NODE_VERSION=16
21242122
21252123
ROOT_CA_ADMIN_NAME=admin
21262124
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -2384,7 +2382,6 @@ generateChannelsArtifacts() {
23842382
}
23852383
23862384
installChannels() {
2387-
set -x
23882385
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
23892386
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
23902387
@@ -3078,7 +3075,6 @@ createChannelTx() {
30783075
30793076
createNewChannelUpdateTx() {
30803077
local CONTAINER_NAME=createAnchorPeerUpdateTx
3081-
30823078
local CHANNEL_NAME=$1
30833079
local MSP_NAME=$2
30843080
local CONFIG_PROFILE=$3
@@ -3853,11 +3849,9 @@ set -eu
38533849
38543850
createChannelAndJoin() {
38553851
local CHANNEL_NAME=$1
3856-
38573852
local CORE_PEER_LOCALMSPID=$2
38583853
local CORE_PEER_ADDRESS=$3
38593854
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
3860-
38613855
local ORDERER_URL=$5
38623856
38633857
local DIR_NAME=step-createChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -3879,7 +3873,6 @@ createChannelAndJoin() {
38793873
38803874
createChannelAndJoinTls() {
38813875
local CHANNEL_NAME=$1
3882-
38833876
local CORE_PEER_LOCALMSPID=$2
38843877
local CORE_PEER_ADDRESS=$3
38853878
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
@@ -3915,11 +3908,9 @@ createChannelAndJoinTls() {
39153908
39163909
fetchChannelAndJoin() {
39173910
local CHANNEL_NAME=$1
3918-
39193911
local CORE_PEER_LOCALMSPID=$2
39203912
local CORE_PEER_ADDRESS=$3
39213913
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
3922-
39233914
local ORDERER_URL=$5
39243915
39253916
local DIR_NAME=step-fetchChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -3940,7 +3931,6 @@ fetchChannelAndJoin() {
39403931
39413932
fetchChannelAndJoinTls() {
39423933
local CHANNEL_NAME=$1
3943-
39443934
local CORE_PEER_LOCALMSPID=$2
39453935
local CORE_PEER_ADDRESS=$3
39463936
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3039,11 +3039,9 @@ FABRIC_CA_POSTGRES_VERSION=14
30393039
FABRIC_CCENV_VERSION=2.4.3
30403040
FABRIC_BASEOS_VERSION=2.4.3
30413041
3042-
3043-
FABRIC_JAVAENV_VERSION=3.0-beta
3044-
FABRIC_NODEENV_VERSION=2.5
3045-
RECOMMENDED_NODE_VERSION=18
3046-
3042+
FABRIC_JAVAENV_VERSION=2.4
3043+
FABRIC_NODEENV_VERSION=2.4
3044+
RECOMMENDED_NODE_VERSION=16
30473045
30483046
ROOT_CA_ADMIN_NAME=admin
30493047
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -3498,7 +3496,6 @@ generateChannelsArtifacts() {
34983496
}
34993497
35003498
installChannels() {
3501-
set -x
35023499
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
35033500
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7061' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer1.com-cert.pem' 'orderer0.group1.orderer1.com:7030';"
35043501
@@ -4487,7 +4484,6 @@ createChannelTx() {
44874484
44884485
createNewChannelUpdateTx() {
44894486
local CONTAINER_NAME=createAnchorPeerUpdateTx
4490-
44914487
local CHANNEL_NAME=$1
44924488
local MSP_NAME=$2
44934489
local CONFIG_PROFILE=$3
@@ -5262,11 +5258,9 @@ set -eu
52625258
52635259
createChannelAndJoin() {
52645260
local CHANNEL_NAME=$1
5265-
52665261
local CORE_PEER_LOCALMSPID=$2
52675262
local CORE_PEER_ADDRESS=$3
52685263
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
5269-
52705264
local ORDERER_URL=$5
52715265
52725266
local DIR_NAME=step-createChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -5288,7 +5282,6 @@ createChannelAndJoin() {
52885282
52895283
createChannelAndJoinTls() {
52905284
local CHANNEL_NAME=$1
5291-
52925285
local CORE_PEER_LOCALMSPID=$2
52935286
local CORE_PEER_ADDRESS=$3
52945287
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
@@ -5324,11 +5317,9 @@ createChannelAndJoinTls() {
53245317
53255318
fetchChannelAndJoin() {
53265319
local CHANNEL_NAME=$1
5327-
53285320
local CORE_PEER_LOCALMSPID=$2
53295321
local CORE_PEER_ADDRESS=$3
53305322
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
5331-
53325323
local ORDERER_URL=$5
53335324
53345325
local DIR_NAME=step-fetchChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -5349,7 +5340,6 @@ fetchChannelAndJoin() {
53495340
53505341
fetchChannelAndJoinTls() {
53515342
local CHANNEL_NAME=$1
5352-
53535343
local CORE_PEER_LOCALMSPID=$2
53545344
local CORE_PEER_ADDRESS=$3
53555345
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3334,11 +3334,9 @@ FABRIC_CA_POSTGRES_VERSION=14
33343334
FABRIC_CCENV_VERSION=2.3.2
33353335
FABRIC_BASEOS_VERSION=2.3.2
33363336
3337-
3338-
FABRIC_JAVAENV_VERSION=3.0-beta
3339-
FABRIC_NODEENV_VERSION=2.5
3340-
RECOMMENDED_NODE_VERSION=18
3341-
3337+
FABRIC_JAVAENV_VERSION=2.3
3338+
FABRIC_NODEENV_VERSION=2.3
3339+
RECOMMENDED_NODE_VERSION=12
33423340
33433341
ROOT_CA_ADMIN_NAME=admin
33443342
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -3836,7 +3834,6 @@ generateChannelsArtifacts() {
38363834
}
38373835
38383836
installChannels() {
3839-
set -x
38403837
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
38413838
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
38423839
@@ -4999,7 +4996,6 @@ createChannelTx() {
49994996
50004997
createNewChannelUpdateTx() {
50014998
local CONTAINER_NAME=createAnchorPeerUpdateTx
5002-
50034999
local CHANNEL_NAME=$1
50045000
local MSP_NAME=$2
50055001
local CONFIG_PROFILE=$3
@@ -5774,11 +5770,9 @@ set -eu
57745770
57755771
createChannelAndJoin() {
57765772
local CHANNEL_NAME=$1
5777-
57785773
local CORE_PEER_LOCALMSPID=$2
57795774
local CORE_PEER_ADDRESS=$3
57805775
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
5781-
57825776
local ORDERER_URL=$5
57835777
57845778
local DIR_NAME=step-createChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -5800,7 +5794,6 @@ createChannelAndJoin() {
58005794
58015795
createChannelAndJoinTls() {
58025796
local CHANNEL_NAME=$1
5803-
58045797
local CORE_PEER_LOCALMSPID=$2
58055798
local CORE_PEER_ADDRESS=$3
58065799
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
@@ -5836,11 +5829,9 @@ createChannelAndJoinTls() {
58365829
58375830
fetchChannelAndJoin() {
58385831
local CHANNEL_NAME=$1
5839-
58405832
local CORE_PEER_LOCALMSPID=$2
58415833
local CORE_PEER_ADDRESS=$3
58425834
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
5843-
58445835
local ORDERER_URL=$5
58455836
58465837
local DIR_NAME=step-fetchChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -5861,7 +5852,6 @@ fetchChannelAndJoin() {
58615852
58625853
fetchChannelAndJoinTls() {
58635854
local CHANNEL_NAME=$1
5864-
58655855
local CORE_PEER_LOCALMSPID=$2
58665856
local CORE_PEER_ADDRESS=$3
58675857
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")

‎e2e/__snapshots__/fabloCommands.test.ts.snap‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ exports[`extend config should extend custom config 1`] = `
44
"Validation errors count: 0
55
Validation warnings count: 0
66
===========================================================
7-
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
87
{
98
"global": {
109
"fabricVersion": "2.4.3",
@@ -2471,7 +2470,6 @@ exports[`extend config should extend default config 1`] = `
24712470
"Validation errors count: 0
24722471
Validation warnings count: 0
24732472
===========================================================
2474-
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
24752473
{
24762474
"global": {
24772475
"fabricVersion": "2.5.9",

0 commit comments

Comments
 (0)