BE-853 Resolve race condition of discovery request (#212)

Signed-off-by: Atsushi Neki <nekiaiken@gmail.com>

Author: nekia

app/platform/fabric/config.json

@@ -2,7 +2,7 @@
 	"network-configs": {
 		"test-network": {
 			"name": "Test Network",
-			"profile": "./connection-profile/test-network-ca.json"
+			"profile": "./connection-profile/test-network.json"
 		}
 	},
 	"license": "Apache-2.0"

app/platform/fabric/gateway/FabricGateway.ts

@@ -56,6 +56,7 @@ export class FabricGateway {
 		this.asLocalhost = false;
 		this.ds = null;
 		this.dsTargets = [];
+		this.waitingResp = false;
 	}
 
 	async initialize() {
@@ -432,6 +433,7 @@ export class FabricGateway {
 		try {
 			if (!this.waitingResp) {
 				this.waitingResp = true;
+				logger.info('Sending discovery request...');
 				await this.ds.send({
 					asLocalhost: this.asLocalhost,
 					requestTimeout: 5000,
@@ -441,18 +443,18 @@ export class FabricGateway {
 				logger.info('Succeeded to send discovery request');
 			} else {
 				logger.info('Have already been sending a request');
+				return null;
 			}
 
 			result = await this.ds.getDiscoveryResults(true);
+			this.waitingResp = false;
 		} catch (error) {
 			logger.warn('Failed to send discovery request for channel', error);
 			if (this.ds) {
 				this.ds.close();
 				this.ds = null;
 			}
 			result = null;
-		} finally {
-			this.waitingResp = false;
 		}
 		return result;
 	}

app/test/FabricGateway.test.ts

@@ -67,7 +67,7 @@ function getFabricGatewayInstance() {
 	const config = new FabricConfig();
 	config.initialize('first-network', {
 		name: 'My first network',
-		profile: './connection-profile/first-network.json'
+		profile: './connection-profile/test-network.json'
 	});
 	sinon.stub(config, 'getPeerTlsCACertsPem');
 

app/test/SyncService.test.ts

@@ -52,7 +52,7 @@ function getSyncServicesInstance() {
 	const config = new FabricConfig();
 	config.initialize('first-network', {
 		name: 'My first network',
-		profile: './connection-profile/first-network.json'
+		profile: './connection-profile/test-network.json'
 	});
 	sinon.stub(config, 'getPeerTlsCACertsPem');
 	const stubGetCrudService = sinon.stub();