Skip to content

Commit 552e538

Browse files
OsamaRab3OsamaRab3
committed
modifiy to support a single peer only
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent e37a472 commit 552e538

10 files changed

+99
-109
lines changed

‎e2e-network/docker/test-05-v3.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,5 @@ expectCommand "cat \"$TEST_TMP/another.block\"" "put"
119119
expectCommand "cat \"$TEST_TMP/channel-config.json\"" "\"mod_policy\": \"Admins\","
120120

121121
expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":5"
122-
expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":6"
123122

124123
echo "🎉 Test passed! 🎉"

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2918,25 +2918,25 @@ peerChaincodeInvokeTls() {
29182918
29192919
peerChaincodeQuery() {
29202920
local CLI="$1"
2921-
local PEERS="$2"
2921+
local PEER="$2"
29222922
local CHANNEL="$3"
29232923
local CHAINCODE="$4"
29242924
local COMMAND="$5"
29252925
local TRANSIENT="$6"
29262926
29272927
echo "Chaincode query:"
29282928
inputLog "CLI: $CLI"
2929-
inputLog "PEERS: $PEERS"
2929+
inputLog "PEER: $PEER"
29302930
inputLog "CHANNEL: $CHANNEL"
29312931
inputLog "CHAINCODE: $CHAINCODE"
29322932
inputLog "COMMAND: $COMMAND"
29332933
inputLog "TRANSIENT: $TRANSIENT"
29342934
2935-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
2935+
PEER_ADDRESS="--peerAddresses $PEER"
29362936
29372937
# shellcheck disable=SC2086
29382938
docker exec "$CLI" peer chaincode query \\
2939-
$PEER_ADDRESSES \\
2939+
$PEER_ADDRESS \\
29402940
-C "$CHANNEL" \\
29412941
-n "$CHAINCODE" \\
29422942
-c "$COMMAND" \\
@@ -2946,31 +2946,30 @@ peerChaincodeQuery() {
29462946
29472947
peerChaincodeQueryTls() {
29482948
local CLI="$1"
2949-
local PEERS="$2"
2949+
local PEER="$2"
29502950
local CHANNEL="$3"
29512951
local CHAINCODE="$4"
29522952
local COMMAND="$5"
29532953
local TRANSIENT="$6"
2954-
local PEER_CERTS="$7"
2954+
local PEER_CERT="$7"
29552955
local CA_CERT="$8"
29562956
29572957
echo "Chaincode query:"
29582958
inputLog "CLI: $CLI"
2959-
inputLog "PEERS: $PEERS"
2959+
inputLog "PEER: $PEER"
29602960
inputLog "CHANNEL: $CHANNEL"
29612961
inputLog "CHAINCODE: $CHAINCODE"
29622962
inputLog "COMMAND: $COMMAND"
29632963
inputLog "TRANSIENT: $TRANSIENT"
2964-
inputLog "PEER_CERTS: $PEER_CERTS"
2964+
inputLog "PEER_CERTS: $PEER_CERT"
29652965
inputLog "CA_CERT: $CA_CERT"
29662966
2967-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
2968-
2969-
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$(echo "$PEER_CERTS" | sed 's/,/ --tlsRootCertFiles \\/var\\/hyperledger\\/cli\\//g')"
2967+
PEER_ADDRESS="--peerAddresses $PEER"
29702968
2969+
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$PEER_CERT"
29712970
# shellcheck disable=SC2086
29722971
docker exec "$CLI" peer chaincode query \\
2973-
$PEER_ADDRESSES \\
2972+
$PEER_ADDRESS \\
29742973
$TLS_ROOT_CERT_FILES \\
29752974
-C "$CHANNEL" \\
29762975
-n "$CHAINCODE" \\

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3123,25 +3123,25 @@ peerChaincodeInvokeTls() {
31233123
31243124
peerChaincodeQuery() {
31253125
local CLI="$1"
3126-
local PEERS="$2"
3126+
local PEER="$2"
31273127
local CHANNEL="$3"
31283128
local CHAINCODE="$4"
31293129
local COMMAND="$5"
31303130
local TRANSIENT="$6"
31313131
31323132
echo "Chaincode query:"
31333133
inputLog "CLI: $CLI"
3134-
inputLog "PEERS: $PEERS"
3134+
inputLog "PEER: $PEER"
31353135
inputLog "CHANNEL: $CHANNEL"
31363136
inputLog "CHAINCODE: $CHAINCODE"
31373137
inputLog "COMMAND: $COMMAND"
31383138
inputLog "TRANSIENT: $TRANSIENT"
31393139
3140-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
3140+
PEER_ADDRESS="--peerAddresses $PEER"
31413141
31423142
# shellcheck disable=SC2086
31433143
docker exec "$CLI" peer chaincode query \\
3144-
$PEER_ADDRESSES \\
3144+
$PEER_ADDRESS \\
31453145
-C "$CHANNEL" \\
31463146
-n "$CHAINCODE" \\
31473147
-c "$COMMAND" \\
@@ -3151,31 +3151,30 @@ peerChaincodeQuery() {
31513151
31523152
peerChaincodeQueryTls() {
31533153
local CLI="$1"
3154-
local PEERS="$2"
3154+
local PEER="$2"
31553155
local CHANNEL="$3"
31563156
local CHAINCODE="$4"
31573157
local COMMAND="$5"
31583158
local TRANSIENT="$6"
3159-
local PEER_CERTS="$7"
3159+
local PEER_CERT="$7"
31603160
local CA_CERT="$8"
31613161
31623162
echo "Chaincode query:"
31633163
inputLog "CLI: $CLI"
3164-
inputLog "PEERS: $PEERS"
3164+
inputLog "PEER: $PEER"
31653165
inputLog "CHANNEL: $CHANNEL"
31663166
inputLog "CHAINCODE: $CHAINCODE"
31673167
inputLog "COMMAND: $COMMAND"
31683168
inputLog "TRANSIENT: $TRANSIENT"
3169-
inputLog "PEER_CERTS: $PEER_CERTS"
3169+
inputLog "PEER_CERTS: $PEER_CERT"
31703170
inputLog "CA_CERT: $CA_CERT"
31713171
3172-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
3173-
3174-
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$(echo "$PEER_CERTS" | sed 's/,/ --tlsRootCertFiles \\/var\\/hyperledger\\/cli\\//g')"
3172+
PEER_ADDRESS="--peerAddresses $PEER"
31753173
3174+
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$PEER_CERT"
31763175
# shellcheck disable=SC2086
31773176
docker exec "$CLI" peer chaincode query \\
3178-
$PEER_ADDRESSES \\
3177+
$PEER_ADDRESS \\
31793178
$TLS_ROOT_CERT_FILES \\
31803179
-C "$CHANNEL" \\
31813180
-n "$CHAINCODE" \\

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2986,25 +2986,25 @@ peerChaincodeInvokeTls() {
29862986
29872987
peerChaincodeQuery() {
29882988
local CLI="$1"
2989-
local PEERS="$2"
2989+
local PEER="$2"
29902990
local CHANNEL="$3"
29912991
local CHAINCODE="$4"
29922992
local COMMAND="$5"
29932993
local TRANSIENT="$6"
29942994
29952995
echo "Chaincode query:"
29962996
inputLog "CLI: $CLI"
2997-
inputLog "PEERS: $PEERS"
2997+
inputLog "PEER: $PEER"
29982998
inputLog "CHANNEL: $CHANNEL"
29992999
inputLog "CHAINCODE: $CHAINCODE"
30003000
inputLog "COMMAND: $COMMAND"
30013001
inputLog "TRANSIENT: $TRANSIENT"
30023002
3003-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
3003+
PEER_ADDRESS="--peerAddresses $PEER"
30043004
30053005
# shellcheck disable=SC2086
30063006
docker exec "$CLI" peer chaincode query \\
3007-
$PEER_ADDRESSES \\
3007+
$PEER_ADDRESS \\
30083008
-C "$CHANNEL" \\
30093009
-n "$CHAINCODE" \\
30103010
-c "$COMMAND" \\
@@ -3014,31 +3014,30 @@ peerChaincodeQuery() {
30143014
30153015
peerChaincodeQueryTls() {
30163016
local CLI="$1"
3017-
local PEERS="$2"
3017+
local PEER="$2"
30183018
local CHANNEL="$3"
30193019
local CHAINCODE="$4"
30203020
local COMMAND="$5"
30213021
local TRANSIENT="$6"
3022-
local PEER_CERTS="$7"
3022+
local PEER_CERT="$7"
30233023
local CA_CERT="$8"
30243024
30253025
echo "Chaincode query:"
30263026
inputLog "CLI: $CLI"
3027-
inputLog "PEERS: $PEERS"
3027+
inputLog "PEER: $PEER"
30283028
inputLog "CHANNEL: $CHANNEL"
30293029
inputLog "CHAINCODE: $CHAINCODE"
30303030
inputLog "COMMAND: $COMMAND"
30313031
inputLog "TRANSIENT: $TRANSIENT"
3032-
inputLog "PEER_CERTS: $PEER_CERTS"
3032+
inputLog "PEER_CERTS: $PEER_CERT"
30333033
inputLog "CA_CERT: $CA_CERT"
30343034
3035-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
3036-
3037-
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$(echo "$PEER_CERTS" | sed 's/,/ --tlsRootCertFiles \\/var\\/hyperledger\\/cli\\//g')"
3035+
PEER_ADDRESS="--peerAddresses $PEER"
30383036
3037+
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$PEER_CERT"
30393038
# shellcheck disable=SC2086
30403039
docker exec "$CLI" peer chaincode query \\
3041-
$PEER_ADDRESSES \\
3040+
$PEER_ADDRESS \\
30423041
$TLS_ROOT_CERT_FILES \\
30433042
-C "$CHANNEL" \\
30443043
-n "$CHAINCODE" \\

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3919,25 +3919,25 @@ peerChaincodeInvokeTls() {
39193919
39203920
peerChaincodeQuery() {
39213921
local CLI="$1"
3922-
local PEERS="$2"
3922+
local PEER="$2"
39233923
local CHANNEL="$3"
39243924
local CHAINCODE="$4"
39253925
local COMMAND="$5"
39263926
local TRANSIENT="$6"
39273927
39283928
echo "Chaincode query:"
39293929
inputLog "CLI: $CLI"
3930-
inputLog "PEERS: $PEERS"
3930+
inputLog "PEER: $PEER"
39313931
inputLog "CHANNEL: $CHANNEL"
39323932
inputLog "CHAINCODE: $CHAINCODE"
39333933
inputLog "COMMAND: $COMMAND"
39343934
inputLog "TRANSIENT: $TRANSIENT"
39353935
3936-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
3936+
PEER_ADDRESS="--peerAddresses $PEER"
39373937
39383938
# shellcheck disable=SC2086
39393939
docker exec "$CLI" peer chaincode query \\
3940-
$PEER_ADDRESSES \\
3940+
$PEER_ADDRESS \\
39413941
-C "$CHANNEL" \\
39423942
-n "$CHAINCODE" \\
39433943
-c "$COMMAND" \\
@@ -3947,31 +3947,30 @@ peerChaincodeQuery() {
39473947
39483948
peerChaincodeQueryTls() {
39493949
local CLI="$1"
3950-
local PEERS="$2"
3950+
local PEER="$2"
39513951
local CHANNEL="$3"
39523952
local CHAINCODE="$4"
39533953
local COMMAND="$5"
39543954
local TRANSIENT="$6"
3955-
local PEER_CERTS="$7"
3955+
local PEER_CERT="$7"
39563956
local CA_CERT="$8"
39573957
39583958
echo "Chaincode query:"
39593959
inputLog "CLI: $CLI"
3960-
inputLog "PEERS: $PEERS"
3960+
inputLog "PEER: $PEER"
39613961
inputLog "CHANNEL: $CHANNEL"
39623962
inputLog "CHAINCODE: $CHAINCODE"
39633963
inputLog "COMMAND: $COMMAND"
39643964
inputLog "TRANSIENT: $TRANSIENT"
3965-
inputLog "PEER_CERTS: $PEER_CERTS"
3965+
inputLog "PEER_CERTS: $PEER_CERT"
39663966
inputLog "CA_CERT: $CA_CERT"
39673967
3968-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
3969-
3970-
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$(echo "$PEER_CERTS" | sed 's/,/ --tlsRootCertFiles \\/var\\/hyperledger\\/cli\\//g')"
3968+
PEER_ADDRESS="--peerAddresses $PEER"
39713969
3970+
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$PEER_CERT"
39723971
# shellcheck disable=SC2086
39733972
docker exec "$CLI" peer chaincode query \\
3974-
$PEER_ADDRESSES \\
3973+
$PEER_ADDRESS \\
39753974
$TLS_ROOT_CERT_FILES \\
39763975
-C "$CHANNEL" \\
39773976
-n "$CHAINCODE" \\

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5349,25 +5349,25 @@ peerChaincodeInvokeTls() {
53495349
53505350
peerChaincodeQuery() {
53515351
local CLI="$1"
5352-
local PEERS="$2"
5352+
local PEER="$2"
53535353
local CHANNEL="$3"
53545354
local CHAINCODE="$4"
53555355
local COMMAND="$5"
53565356
local TRANSIENT="$6"
53575357
53585358
echo "Chaincode query:"
53595359
inputLog "CLI: $CLI"
5360-
inputLog "PEERS: $PEERS"
5360+
inputLog "PEER: $PEER"
53615361
inputLog "CHANNEL: $CHANNEL"
53625362
inputLog "CHAINCODE: $CHAINCODE"
53635363
inputLog "COMMAND: $COMMAND"
53645364
inputLog "TRANSIENT: $TRANSIENT"
53655365
5366-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
5366+
PEER_ADDRESS="--peerAddresses $PEER"
53675367
53685368
# shellcheck disable=SC2086
53695369
docker exec "$CLI" peer chaincode query \\
5370-
$PEER_ADDRESSES \\
5370+
$PEER_ADDRESS \\
53715371
-C "$CHANNEL" \\
53725372
-n "$CHAINCODE" \\
53735373
-c "$COMMAND" \\
@@ -5377,31 +5377,30 @@ peerChaincodeQuery() {
53775377
53785378
peerChaincodeQueryTls() {
53795379
local CLI="$1"
5380-
local PEERS="$2"
5380+
local PEER="$2"
53815381
local CHANNEL="$3"
53825382
local CHAINCODE="$4"
53835383
local COMMAND="$5"
53845384
local TRANSIENT="$6"
5385-
local PEER_CERTS="$7"
5385+
local PEER_CERT="$7"
53865386
local CA_CERT="$8"
53875387
53885388
echo "Chaincode query:"
53895389
inputLog "CLI: $CLI"
5390-
inputLog "PEERS: $PEERS"
5390+
inputLog "PEER: $PEER"
53915391
inputLog "CHANNEL: $CHANNEL"
53925392
inputLog "CHAINCODE: $CHAINCODE"
53935393
inputLog "COMMAND: $COMMAND"
53945394
inputLog "TRANSIENT: $TRANSIENT"
5395-
inputLog "PEER_CERTS: $PEER_CERTS"
5395+
inputLog "PEER_CERTS: $PEER_CERT"
53965396
inputLog "CA_CERT: $CA_CERT"
53975397
5398-
PEER_ADDRESSES="--peerAddresses $(echo "$PEERS" | sed 's/,/ --peerAddresses /g')"
5399-
5400-
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$(echo "$PEER_CERTS" | sed 's/,/ --tlsRootCertFiles \\/var\\/hyperledger\\/cli\\//g')"
5398+
PEER_ADDRESS="--peerAddresses $PEER"
54015399
5400+
TLS_ROOT_CERT_FILES="--tlsRootCertFiles /var/hyperledger/cli/$PEER_CERT"
54025401
# shellcheck disable=SC2086
54035402
docker exec "$CLI" peer chaincode query \\
5404-
$PEER_ADDRESSES \\
5403+
$PEER_ADDRESS \\
54055404
$TLS_ROOT_CERT_FILES \\
54065405
-C "$CHANNEL" \\
54075406
-n "$CHAINCODE" \\

0 commit comments

Comments
 (0)