Skip to content

Commit 75a2f05

Browse files
OsamaRab3OsamaRab3
committed
Fix and update
Signed-off-by: Osama Rabea <159753803+OsamaRab3@users.noreply.github.com>
1 parent 7239bdc commit 75a2f05

File tree

4 files changed

+28
-30
lines changed

4 files changed

+28
-30
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e
209209
},
210210
"peers": {
211211
"peer0.org1.example.com": {
212-
"url": "grpc://localhost:7041"
212+
"url": "grpcs://localhost:7041"
213213
},
214214
"peer1.org1.example.com": {
215-
"url": "grpc://localhost:7042"
215+
"url": "grpcs://localhost:7042"
216216
}
217217
},
218218
"certificateAuthorities": {
@@ -244,9 +244,9 @@ organizations:
244244
- ca.orderer.example.com
245245
peers:
246246
peer0.org1.example.com:
247-
url: grpc://localhost:7041
247+
url: grpcs://localhost:7041
248248
peer1.org1.example.com:
249-
url: grpc://localhost:7042
249+
url: grpcs://localhost:7042
250250
certificateAuthorities:
251251
ca.orderer.example.com:
252252
url: http://localhost:7020
@@ -278,10 +278,10 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e
278278
},
279279
"peers": {
280280
"peer0.org1.example.com": {
281-
"url": "grpc://localhost:7041"
281+
"url": "grpcs://localhost:7041"
282282
},
283283
"peer1.org1.example.com": {
284-
"url": "grpc://localhost:7042"
284+
"url": "grpcs://localhost:7042"
285285
}
286286
},
287287
"certificateAuthorities": {
@@ -313,9 +313,9 @@ organizations:
313313
- ca.org1.example.com
314314
peers:
315315
peer0.org1.example.com:
316-
url: grpc://localhost:7041
316+
url: grpcs://localhost:7041
317317
peer1.org1.example.com:
318-
url: grpc://localhost:7042
318+
url: grpcs://localhost:7042
319319
certificateAuthorities:
320320
ca.org1.example.com:
321321
url: http://localhost:7040

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,13 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
264264
},
265265
"peers": {
266266
"peer0.org1.example.com": {
267-
"url": "grpc://localhost:7041"
267+
"url": "grpcs://localhost:7041"
268268
},
269269
"peer1.org1.example.com": {
270-
"url": "grpc://localhost:7042"
270+
"url": "grpcs://localhost:7042"
271271
},
272272
"peer0.org2.example.com": {
273-
"url": "grpc://localhost:7061"
273+
"url": "grpcs://localhost:7061"
274274
}
275275
},
276276
"certificateAuthorities": {
@@ -303,11 +303,11 @@ organizations:
303303
- ca.orderer.example.com
304304
peers:
305305
peer0.org1.example.com:
306-
url: grpc://localhost:7041
306+
url: grpcs://localhost:7041
307307
peer1.org1.example.com:
308-
url: grpc://localhost:7042
308+
url: grpcs://localhost:7042
309309
peer0.org2.example.com:
310-
url: grpc://localhost:7061
310+
url: grpcs://localhost:7061
311311
certificateAuthorities:
312312
ca.orderer.example.com:
313313
url: http://localhost:7020
@@ -340,13 +340,13 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
340340
},
341341
"peers": {
342342
"peer0.org1.example.com": {
343-
"url": "grpc://localhost:7041"
343+
"url": "grpcs://localhost:7041"
344344
},
345345
"peer1.org1.example.com": {
346-
"url": "grpc://localhost:7042"
346+
"url": "grpcs://localhost:7042"
347347
},
348348
"peer0.org2.example.com": {
349-
"url": "grpc://localhost:7061"
349+
"url": "grpcs://localhost:7061"
350350
}
351351
},
352352
"certificateAuthorities": {
@@ -379,11 +379,11 @@ organizations:
379379
- ca.org1.example.com
380380
peers:
381381
peer0.org1.example.com:
382-
url: grpc://localhost:7041
382+
url: grpcs://localhost:7041
383383
peer1.org1.example.com:
384-
url: grpc://localhost:7042
384+
url: grpcs://localhost:7042
385385
peer0.org2.example.com:
386-
url: grpc://localhost:7061
386+
url: grpcs://localhost:7061
387387
certificateAuthorities:
388388
ca.org1.example.com:
389389
url: http://localhost:7040
@@ -416,13 +416,13 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
416416
},
417417
"peers": {
418418
"peer0.org1.example.com": {
419-
"url": "grpc://localhost:7041"
419+
"url": "grpcs://localhost:7041"
420420
},
421421
"peer1.org1.example.com": {
422-
"url": "grpc://localhost:7042"
422+
"url": "grpcs://localhost:7042"
423423
},
424424
"peer0.org2.example.com": {
425-
"url": "grpc://localhost:7061"
425+
"url": "grpcs://localhost:7061"
426426
}
427427
},
428428
"certificateAuthorities": {
@@ -455,11 +455,11 @@ organizations:
455455
- ca.org2.example.com
456456
peers:
457457
peer0.org1.example.com:
458-
url: grpc://localhost:7041
458+
url: grpcs://localhost:7041
459459
peer1.org1.example.com:
460-
url: grpc://localhost:7042
460+
url: grpcs://localhost:7042
461461
peer0.org2.example.com:
462-
url: grpc://localhost:7061
462+
url: grpcs://localhost:7061
463463
certificateAuthorities:
464464
ca.org2.example.com:
465465
url: http://localhost:7060

‎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",
@@ -2472,7 +2471,6 @@ exports[`extend config should extend default config 1`] = `
24722471
"Validation errors count: 0
24732472
Validation warnings count: 0
24742473
===========================================================
2475-
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
24762474
{
24772475
"global": {
24782476
"fabricVersion": "2.5.9",

‎src/types/ConnectionProfile.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function createPeers(
119119
const tlsCACertsExplorerPath = `${rootPath}/peerOrganizations/${o.domain}/msp/tlscacerts/tlsca.${o.domain}-cert.pem`;
120120
if (isTls) {
121121
peers[p.address] = {
122-
url: isExplorer ? `grpcs://${p.fullAddress}` : `grpcs://localhost:${p.port}`,
122+
url: isExplorer ? `grpcs://${p.address}:${p.port}` : `grpcs://localhost:${p.port}`,
123123
tlsCACerts: {
124124
path: isExplorer
125125
? tlsCACertsExplorerPath
@@ -133,7 +133,7 @@ function createPeers(
133133
}
134134
} else {
135135
peers[p.address] = {
136-
url: isExplorer ? `grpc://${p.fullAddress}` : `grpc://localhost:${p.port}`,
136+
url: isExplorer ? `grpcs://${p.address}:${p.port}` : `grpcs://localhost:${p.port}`,
137137
};
138138
if (isExplorer) {
139139
peers[p.address]["tlsCACerts"] = {

0 commit comments

Comments
 (0)