[FAB-11124] remove config property about EventHub

Some developers get confused about why legacy 'eventUrl' property in network config under a peer, and port map to 7053 still persist after migrating to ChannelEventHub. Although they are not used, it is just a proposal to remove them. Change-Id: I4dda548cd1d3eb18a7af374817a961b9b63d1cfc Signed-off-by: davidliu <david-khala@hotmail.com>
hyperledger · Jul 26, 2018 · 38ff937 · 38ff937
1 parent b7e528d
commit 38ff937
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 16 deletions.
diff --git a/docs/tutorials/network-config.md b/docs/tutorials/network-config.md
@@ -107,7 +107,6 @@ orderers:
 peers:
   peer0.org1.example.com:
     url: grpcs://localhost:7051
-    eventUrl: grpcs://localhost:7053
     grpcOptions:
       ssl-target-name-override: peer0.org1.example.com
       grpc.keepalive_time_ms: 600000
@@ -116,7 +115,6 @@ peers:
 
   peer0.org2.example.com:
     url: grpcs://localhost:8051
-    eventUrl: grpcs://localhost:8053
     grpcOptions:
       ssl-target-name-override: peer0.org2.example.com
     tlsCACerts:

diff --git a/fabric-client/lib/impl/NetworkConfig_1_0.js b/fabric-client/lib/impl/NetworkConfig_1_0.js
@@ -27,7 +27,6 @@ const ADMIN_CERT = 'signedCert';
 const GRPC_CONNECTION_OPTIONS = 'grpcOptions';
 const HTTP_CONNECTION_OPTIONS = 'httpOptions';
 const URL = 'url';
-const EVENT_URL = 'eventUrl';
 const CANAME = 'caName';
 const PEM = 'pem';
 const PATH = 'path';

diff --git a/test/fixtures/docker-compose.yaml b/test/fixtures/docker-compose.yaml
@@ -76,7 +76,6 @@ services:
       - CORE_PEER_LISTENADDRESS=peer0.org1.example.com:7051
       - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:7051
       - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051
-      - CORE_PEER_EVENTS_ADDRESS=0.0.0.0:7053
       - CORE_LOGGING_LEVEL=debug
       ## the following setting redirects chaincode container logs to the peer container logs
       - CORE_VM_DOCKER_ATTACHSTDOUT=true
@@ -96,7 +95,6 @@ services:
     command: peer node start
     ports:
       - 7051:7051
-      - 7053:7053
     volumes:
         - /var/run/:/host/var/run/
         - ./channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peer
@@ -113,7 +111,6 @@ services:
       - CORE_PEER_LISTENADDRESS=peer0.org2.example.com:8051
       - CORE_PEER_GOSSIP_ENDPOINT=peer0.org2.example.com:8051
       - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:8051
-      - CORE_PEER_EVENTS_ADDRESS=0.0.0.0:8053
       - CORE_PEER_LOCALMSPID=Org2MSP
       - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/
       - CORE_LOGGING_LEVEL=debug
@@ -131,7 +128,6 @@ services:
     command: peer node start
     ports:
       - 8051:8051
-      - 8053:8053
     volumes:
         - /var/run/:/host/var/run/
         - ./channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/msp/peer

diff --git a/test/fixtures/network-ad.yaml b/test/fixtures/network-ad.yaml
@@ -52,15 +52,13 @@ orderers:
 peers:
   peer0.org1.example.com:
     url: grpcs://localhost:7051
-    eventUrl: grpcs://localhost:7053
     grpcOptions:
       ssl-target-name-override: peer0.org1.example.com
     tlsCACerts:
       path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem
 
   peer0.org2.example.com:
     url: grpcs://localhost:8051
-    eventUrl: grpcs://localhost:8053
     grpcOptions:
       ssl-target-name-override: peer0.org2.example.com
     tlsCACerts:

diff --git a/test/fixtures/network.json b/test/fixtures/network.json
@@ -71,7 +71,6 @@
   "peers":{
     "peer0.org1.example.com":{
       "url":"grpcs://localhost:7051",
-      "eventUrl":"grpcs://localhost:7053",
       "grpcOptions":{
         "ssl-target-name-override":"peer0.org1.example.com"
       },
@@ -81,7 +80,6 @@
     },
     "peer0.org2.example.com":{
       "url":"grpcs://localhost:8051",
-      "eventUrl":"grpcs://localhost:8053",
       "grpcOptions":{
         "ssl-target-name-override":"peer0.org2.example.com"
       },

diff --git a/test/integration/e2e/config.json b/test/integration/e2e/config.json
@@ -14,7 +14,6 @@
 			},
 			"peer1": {
 				"requests": "grpcs://localhost:7051",
-				"events": "grpcs://localhost:7053",
 				"server-hostname": "peer0.org1.example.com",
 				"tls_cacerts": "../../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem"
 			}
@@ -28,7 +27,6 @@
 			},
 			"peer1": {
 				"requests": "grpcs://localhost:8051",
-				"events": "grpcs://localhost:8053",
 				"server-hostname": "peer0.org2.example.com",
 				"tls_cacerts": "../../fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem"
 			}

diff --git a/test/unit/client.js b/test/unit/client.js
@@ -1011,7 +1011,6 @@ test('\n\n*** Test channel selection if no channel name provided ***\n', (t) =>
 		'peers': {
 			'peer0.org1.example.com': {
 				'url': 'grpc://localhost:7051',
-				'eventUrl': 'grpc://localhost:7053'
 			}
 		}
 	};
@@ -1083,11 +1082,9 @@ test('\n\n*** Test Client.getPeersForOrgOnChannel ***\n', (t) => {
 		'peers': {
 			'peer0.org1.example.com': {
 				'url': 'grpc://localhost:7051',
-				'eventUrl': 'grpc://localhost:7053'
 			},
 			'peer0.org2.example.com': {
 				'url': 'grpc://localhost:8051',
-				'eventUrl': 'grpc://localhost:8053'
 			}
 		}
 	};