FABN-1619 Fix requiredOrgs with Discovery (#308) (#309)

The requiredOrgs was not building the endorsement plan correctly.
The peer groups did not contain the proper information.

Signed-off-by: Bret Harrison <[email protected]>

Author: harrisob

fabric-common/lib/DiscoveryHandler.js

@@ -160,10 +160,10 @@ class DiscoveryHandler extends ServiceHandler {
 
 		const results = await this.discovery.getDiscoveryResults(true);
 
-		if (results && request.requiredOrgs) {
+		if (results && results.peers_by_org && request.requiredOrgs) {
 			// special case when user knows which organizations to send the endorsement
 			// let's build our own endorsement plan so that we can use the sorting and sending code
-			const endorsement_plan = this._buildRequiredOrgPlan(results.peers_by_org);
+			const endorsement_plan = this._buildRequiredOrgPlan(results.peers_by_org, request.requiredOrgs);
 
 			// remove all org and peer
 			const orgs_request = {
@@ -320,17 +320,17 @@ class DiscoveryHandler extends ServiceHandler {
 		return responses;
 	}
 
-	_buildRequiredOrgPlan(peers_by_org) {
+	_buildRequiredOrgPlan(peers_by_org, required_orgs) {
 		const method = '_buildRequiredOrgPlan';
 		logger.debug('%s - starting', method);
 		const endorsement_plan = {plan_id: 'required organizations'};
 		endorsement_plan.groups = {};
 		endorsement_plan.layouts = [{}]; // only one layout which will have all organizations
 
-		for (const mspid in peers_by_org) {
+		for (const mspid of required_orgs) {
 			logger.debug(`${method} - found org:${mspid}`);
 			endorsement_plan.groups[mspid] = {}; // make a group for each organization
-			endorsement_plan.groups[mspid].peers = peers_by_org[mspid].peers; // now put in all peers from that organization
+			endorsement_plan.groups[mspid].peers = JSON.parse(JSON.stringify(peers_by_org[mspid].peers)); // now put in all peers from that organization
 			endorsement_plan.layouts[0][mspid] = 1; // add this org to the one layout and require one peer to endorse
 		}
 

fabric-common/test/DiscoveryHandler.js

@@ -152,7 +152,7 @@ describe('DiscoveryHandler', () => {
 		}
 	};
 
-	const organization_plan = {
+	const organization_plan = JSON.parse(JSON.stringify({
 		plan_id: 'required organizations',
 		groups: {
 			Org1MSP: {
@@ -176,7 +176,7 @@ describe('DiscoveryHandler', () => {
 			}
 		},
 		layouts: [{Org1MSP: 1, Org2MSP: 1, Org3MSP: 1}]
-	};
+	}));
 
 	const good = {response: {status: 200}};
 	beforeEach(() => {
@@ -549,10 +549,10 @@ describe('DiscoveryHandler', () => {
 	});
 
 	describe('#_buildRequiredOrgPlan', () => {
-		it('should run ok', async () => {
+		it('should run ok', () => {
 
 			// TEST CALL
-			const results = await discoveryHandler._buildRequiredOrgPlan(config_results.peers_by_org);
+			const results = discoveryHandler._buildRequiredOrgPlan(config_results.peers_by_org, ['Org1MSP', 'Org2MSP', 'Org3MSP']);
 			results.should.deep.equal(organization_plan);
 		});
 	});

fabric-network/src/transaction.ts

@@ -41,11 +41,14 @@ function newEndorsementError(proposalResponse: ProposalResponse): Error {
 	const errorInfos: ErrorInfo[] = [];
 
 	for (const error of proposalResponse.errors) {
-		const errorInfo = {
-			peer: error.connection.name,
+		const errorInfo: ErrorInfo = {
+			peer: 'unknown',
 			status: 'grpc',
 			message: error.message
 		};
+		if (error.connection) {
+			errorInfo.peer = error.connection.name;
+		}
 		errorInfos.push(errorInfo);
 	}