[FAB-6471] NodeSDK - remove header return

NodeSDK no longer needs the header as an input parameter and should be removed from the response Update test cases to reflect this change. Change-Id: I8abdaf247f08f4b01ebd669128a132df3c476e04 Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
hyperledger · Oct 6, 2017 · 3c8ec76 · 3c8ec76
1 parent 4800f64
commit 3c8ec76
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/fabric-client/lib/Channel.js b/fabric-client/lib/Channel.js
@@ -1203,7 +1203,7 @@ var Channel = class {
 		return clientUtils.sendPeersProposal(peers, signed_proposal, timeout)
 		.then(
 			function(responses) {
-				return [responses, proposal, header];
+				return [responses, proposal];
 			}
 		);
 	}
@@ -1318,7 +1318,7 @@ var Channel = class {
 		return clientUtils.sendPeersProposal(request.targets, signed_proposal, timeout)
 		.then(
 			function(responses) {
-				return Promise.resolve([responses, proposal, header]);
+				return Promise.resolve([responses, proposal]);
 			}
 		).catch(
 			function(err) {

diff --git a/fabric-client/lib/Client.js b/fabric-client/lib/Client.js
@@ -873,7 +873,7 @@ var Client = class extends BaseClient {
 			return clientUtils.sendPeersProposal(peers, signed_proposal, timeout)
 			.then(
 				function(responses) {
-					return [responses, proposal, header];
+					return [responses, proposal];
 				}
 			);
 		});

diff --git a/test/integration/invoke.js b/test/integration/invoke.js
@@ -197,9 +197,7 @@ function invokeChaincode(userOrg, version, t, shouldFail, peers){
 
 	}).then((results) => {
 		var proposalResponses = results[0];
-
 		var proposal = results[1];
-		var header   = results[2];
 		var all_good = true;
 
 		for(var i in proposalResponses) {
@@ -235,8 +233,7 @@ function invokeChaincode(userOrg, version, t, shouldFail, peers){
 
 			var request = {
 				proposalResponses: proposalResponses,
-				proposal: proposal,
-				header: header
+				proposal: proposal
 			};
 
 			// set the transaction listener and set a timeout of 30sec

diff --git a/test/integration/orderer-channel-tests.js b/test/integration/orderer-channel-tests.js
@@ -207,8 +207,7 @@ test('\n\n** TEST ** orderer via member bad request', function(t) {
 			// send to orderer
 			var request = {
 				proposalResponses: 'blah',
-				proposal: 'blah',
-				header: 'blah'
+				proposal: 'blah'
 			};
 			return channel.sendTransaction(request);
 		},
@@ -236,4 +235,3 @@ test('\n\n** TEST ** orderer via member bad request', function(t) {
 		t.end();
 	});
 });
-
diff --git a/test/integration/perf/orderer.js b/test/integration/perf/orderer.js
@@ -287,8 +287,7 @@ function makeEnvelope(signer, type) {
 			// send to orderer
 	// 		var request = {
 	// 			proposalResponses: 'blah',
-	// 			proposal: 'blah',
-	// 			header: 'blah'
+	// 			proposal: 'blah'
 	// 		};
 	// 		return channel.sendTransaction(request);
 	// ).then(
@@ -311,4 +310,3 @@ function makeEnvelope(signer, type) {
 	// 	t.pass('Error: ' + err);
 	// 	t.end();
 	// });
-