[FAB-8979] EventURL is no longer required

Change-Id: I59c22cb225f62cb683220a8b40b47d2cd05407c7 Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Mar 20, 2018 · 05a4b00 · 05a4b00
1 parent d81da9a
commit 05a4b00
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/pkg/core/config/config.go b/pkg/core/config/config.go
@@ -1299,9 +1299,6 @@ func (c *Config) verifyPeerConfig(p core.PeerConfig, peerName string, tlsEnabled
 	if p.URL == "" {
 		return errors.Errorf("URL does not exist or empty for peer %s", peerName)
 	}
-	if p.EventURL == "" {
-		return errors.Errorf("event URL does not exist or empty for peer %s", peerName)
-	}
 	if tlsEnabled && len(p.TLSCACerts.Pem) == 0 && p.TLSCACerts.Path == "" && c.configViper.GetBool("client.tlsCerts.systemCertPool") == false {
 		return errors.Errorf("tls.certificate does not exist or empty for peer %s", peerName)
 	}

diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml
@@ -242,17 +242,16 @@ orderers:
 
     # these are standard properties defined by the gRPC library
     # they will be passed in as-is to gRPC client constructor
-    #TODO to be moved to high level, common for all grpc connections
     grpcOptions:
       ssl-target-name-override: orderer.example.com
-#     These parameters should be set in coordination with the keepalive policy on the server,
-#     as incompatible settings can result in closing of connection.
-#     When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
+      # These parameters should be set in coordination with the keepalive policy on the server,
+      # as incompatible settings can result in closing of connection.
+      # When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
       keep-alive-time: 0s
       keep-alive-timeout: 20s
       keep-alive-permit: false
       fail-fast: false
-      #will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
+      # allow-insecure will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
       allow-insecure: false
 
     tlsCACerts:
@@ -267,21 +266,19 @@ peers:
   local.peer0.org1.example.com:
     # this URL is used to send endorsement and query requests
     url: peer0.org1.example.com:7051
-
-    # this URL is used to connect the EventHub and registering event listeners
+    # eventUrl is only needed when using eventhub (default is delivery service)
     eventUrl: peer0.org1.example.com:7053
 
-    #TODO to be moved to high level, common for all grpc connections
     grpcOptions:
       ssl-target-name-override: peer0.org1.example.com
-#     These parameters should be set in coordination with the keepalive policy on the server,
-#     as incompatible settings can result in closing of connection.
-#     When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
+      # These parameters should be set in coordination with the keepalive policy on the server,
+      # as incompatible settings can result in closing of connection.
+      # When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
       keep-alive-time: 0s
       keep-alive-timeout: 20s
       keep-alive-permit: false
       fail-fast: false
-      #will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
+      # allow-insecure will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
       allow-insecure: false
 
     tlsCACerts:
@@ -290,18 +287,18 @@ peers:
 
   local.peer0.org2.example.com:
     url: peer0.org2.example.com:8051
+    # eventUrl is only needed when using eventhub (default is delivery service)
     eventUrl: peer0.org2.example.com:8053
-    #TODO to be moved to high level, common for all grpc connections
     grpcOptions:
       ssl-target-name-override: peer0.org2.example.com
-#     These parameters should be set in coordination with the keepalive policy on the server,
-#     as incompatible settings can result in closing of connection.
-#     When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
+      # These parameters should be set in coordination with the keepalive policy on the server,
+      # as incompatible settings can result in closing of connection.
+      # When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
       keep-alive-time: 0s
       keep-alive-timeout: 20s
       keep-alive-permit: false
       fail-fast: false
-      #will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
+      # allow-insecure will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
       allow-insecure: false
 
     tlsCACerts: