FABN-1413 NodeSDK addCommitter fails

The addCommitter and addEndorser now check that the service endpoint is connected before allowing them to be assigned to this channel. This makes the endpoints available for service request. Signed-off-by: Bret Harrison <[email protected]> Change-Id: I51f1aa1bb4be1d5d5f4605f63702e14aff32699e
hyperledger · Nov 6, 2019 · eeebb17 · eeebb17
1 parent 9a38da6
commit eeebb17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fabric-common/lib/DiscoveryService.js b/fabric-common/lib/DiscoveryService.js
@@ -580,10 +580,10 @@ class DiscoveryService extends ServiceAction {
 		const url = this._buildUrl(host, port);
 		logger.debug(`${method} - create a new orderer ${url}`);
 		const orderer = this.client.newCommitter(address, msp_id);
-		this.channel.addCommitter(orderer);
 		const end_point = this.client.newEndpoint(this._buildOptions(address, url, host, msp_id));
 		try {
 			await orderer.connect(end_point);
+			this.channel.addCommitter(orderer);
 		} catch (error) {
 			logger.error(`${method} - Unable to connect to the discovered orderer ${address} due to ${error}`);
 		}
@@ -611,11 +611,11 @@ class DiscoveryService extends ServiceAction {
 		const url = this._buildUrl(host_port[0], host_port[1]);
 		logger.debug(`${method} - create a new endorser ${url}`);
 		const peer = this.client.getEndorser(address, msp_id);
-		this.channel.addEndorser(peer);
 		const end_point = this.client.newEndpoint(this._buildOptions(address, url, host_port[0], msp_id));
 		try {
 			logger.debug(`${method} - about to connect to endorser ${address} url:${url}`);
 			await peer.connect(end_point);
+			this.channel.addEndorser(peer);
 			logger.debug(`${method} - connected to peer ${address} url:${url}`);
 		} catch (error) {
 			logger.error(`${method} - Unable to connect to the discovered peer ${address} due to ${error}`);

diff --git a/test/scenario/features/steps/base_steps.js b/test/scenario/features/steps/base_steps.js
@@ -350,7 +350,7 @@ module.exports = function () {
 					}
 
 					// check the orderers discovered for mspid
-					orderers = channel.getOrderers('OrdererMSP'); // gets all peers
+					orderers = channel.getCommitters('OrdererMSP'); // gets all peers
 					if (await orderers[0].checkConnection()) {
 						testUtil.logMsg(`Orderer ${orderers[0].name} is connected`);
 					} else {