Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 05a4b00

Browse files
committed
[FAB-8979] EventURL is no longer required
Change-Id: I59c22cb225f62cb683220a8b40b47d2cd05407c7 Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent d81da9a commit 05a4b00

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

pkg/core/config/config.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,9 +1299,6 @@ func (c *Config) verifyPeerConfig(p core.PeerConfig, peerName string, tlsEnabled
12991299
if p.URL == "" {
13001300
return errors.Errorf("URL does not exist or empty for peer %s", peerName)
13011301
}
1302-
if p.EventURL == "" {
1303-
return errors.Errorf("event URL does not exist or empty for peer %s", peerName)
1304-
}
13051302
if tlsEnabled && len(p.TLSCACerts.Pem) == 0 && p.TLSCACerts.Path == "" && c.configViper.GetBool("client.tlsCerts.systemCertPool") == false {
13061303
return errors.Errorf("tls.certificate does not exist or empty for peer %s", peerName)
13071304
}

test/fixtures/config/config_test.yaml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,16 @@ orderers:
242242

243243
# these are standard properties defined by the gRPC library
244244
# they will be passed in as-is to gRPC client constructor
245-
#TODO to be moved to high level, common for all grpc connections
246245
grpcOptions:
247246
ssl-target-name-override: orderer.example.com
248-
# These parameters should be set in coordination with the keepalive policy on the server,
249-
# as incompatible settings can result in closing of connection.
250-
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
247+
# These parameters should be set in coordination with the keepalive policy on the server,
248+
# as incompatible settings can result in closing of connection.
249+
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
251250
keep-alive-time: 0s
252251
keep-alive-timeout: 20s
253252
keep-alive-permit: false
254253
fail-fast: false
255-
#will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
254+
# allow-insecure will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
256255
allow-insecure: false
257256

258257
tlsCACerts:
@@ -267,21 +266,19 @@ peers:
267266
local.peer0.org1.example.com:
268267
# this URL is used to send endorsement and query requests
269268
url: peer0.org1.example.com:7051
270-
271-
# this URL is used to connect the EventHub and registering event listeners
269+
# eventUrl is only needed when using eventhub (default is delivery service)
272270
eventUrl: peer0.org1.example.com:7053
273271

274-
#TODO to be moved to high level, common for all grpc connections
275272
grpcOptions:
276273
ssl-target-name-override: peer0.org1.example.com
277-
# These parameters should be set in coordination with the keepalive policy on the server,
278-
# as incompatible settings can result in closing of connection.
279-
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
274+
# These parameters should be set in coordination with the keepalive policy on the server,
275+
# as incompatible settings can result in closing of connection.
276+
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
280277
keep-alive-time: 0s
281278
keep-alive-timeout: 20s
282279
keep-alive-permit: false
283280
fail-fast: false
284-
#will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
281+
# allow-insecure will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
285282
allow-insecure: false
286283

287284
tlsCACerts:
@@ -290,18 +287,18 @@ peers:
290287

291288
local.peer0.org2.example.com:
292289
url: peer0.org2.example.com:8051
290+
# eventUrl is only needed when using eventhub (default is delivery service)
293291
eventUrl: peer0.org2.example.com:8053
294-
#TODO to be moved to high level, common for all grpc connections
295292
grpcOptions:
296293
ssl-target-name-override: peer0.org2.example.com
297-
# These parameters should be set in coordination with the keepalive policy on the server,
298-
# as incompatible settings can result in closing of connection.
299-
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
294+
# These parameters should be set in coordination with the keepalive policy on the server,
295+
# as incompatible settings can result in closing of connection.
296+
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
300297
keep-alive-time: 0s
301298
keep-alive-timeout: 20s
302299
keep-alive-permit: false
303300
fail-fast: false
304-
#will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
301+
# allow-insecure will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
305302
allow-insecure: false
306303

307304
tlsCACerts:

0 commit comments

Comments
 (0)