From 95502b6df32faec803f436f1b9f9597e9484217d Mon Sep 17 00:00:00 2001 From: Bret Harrison Date: Fri, 23 Jun 2017 12:55:08 -0400 Subject: [PATCH] [FAB-4964] NodeSDK - update test cases Update test cases to remove the need to save and return the header. This requirement has been removed from the SDK and should also be removed from the test cases to avoid confusion for users. Change-Id: I94b48837e66bafa093978ed378baa21bc91a9a04 Signed-off-by: Bret Harrison --- examples/balance-transfer/app/install-chaincode.js | 1 - examples/balance-transfer/app/instantiate-chaincode.js | 4 +--- examples/balance-transfer/app/invoke-transaction.js | 4 +--- test/integration/e2e/e2eUtils.js | 9 ++------- test/integration/eventutil.js | 4 +--- test/integration/install.js | 1 - 6 files changed, 5 insertions(+), 18 deletions(-) diff --git a/examples/balance-transfer/app/install-chaincode.js b/examples/balance-transfer/app/install-chaincode.js index 360b0b884a..591b4c7ae8 100644 --- a/examples/balance-transfer/app/install-chaincode.js +++ b/examples/balance-transfer/app/install-chaincode.js @@ -44,7 +44,6 @@ var installChaincode = function(peers, chaincodeName, chaincodePath, }).then((results) => { var proposalResponses = results[0]; var proposal = results[1]; - var header = results[2]; var all_good = true; for (var i in proposalResponses) { let one_good = false; diff --git a/examples/balance-transfer/app/instantiate-chaincode.js b/examples/balance-transfer/app/instantiate-chaincode.js index 92e3c5a479..199f139e34 100644 --- a/examples/balance-transfer/app/instantiate-chaincode.js +++ b/examples/balance-transfer/app/instantiate-chaincode.js @@ -60,7 +60,6 @@ var instantiateChaincode = function(channelName, chaincodeName, chaincodeVersion }).then((results) => { var proposalResponses = results[0]; var proposal = results[1]; - var header = results[2]; var all_good = true; for (var i in proposalResponses) { let one_good = false; @@ -81,8 +80,7 @@ var instantiateChaincode = function(channelName, chaincodeName, chaincodeVersion .signature)); var request = { proposalResponses: proposalResponses, - proposal: proposal, - header: header + proposal: proposal }; // set the transaction listener and set a timeout of 30sec // if the transaction did not get committed within the timeout period, diff --git a/examples/balance-transfer/app/invoke-transaction.js b/examples/balance-transfer/app/invoke-transaction.js index 30a91733b0..fa4202ddd4 100644 --- a/examples/balance-transfer/app/invoke-transaction.js +++ b/examples/balance-transfer/app/invoke-transaction.js @@ -52,7 +52,6 @@ var invokeChaincode = function(peersUrls, channelName, chaincodeName, fcn, args, }).then((results) => { var proposalResponses = results[0]; var proposal = results[1]; - var header = results[2]; var all_good = true; for (var i in proposalResponses) { let one_good = false; @@ -73,8 +72,7 @@ var invokeChaincode = function(peersUrls, channelName, chaincodeName, fcn, args, .signature)); var request = { proposalResponses: proposalResponses, - proposal: proposal, - header: header + proposal: proposal }; // set the transaction listener and set a timeout of 30sec // if the transaction did not get committed within the timeout period, diff --git a/test/integration/e2e/e2eUtils.js b/test/integration/e2e/e2eUtils.js index 8f1022f524..5e81cca6e4 100644 --- a/test/integration/e2e/e2eUtils.js +++ b/test/integration/e2e/e2eUtils.js @@ -122,7 +122,6 @@ function installChaincode(org, chaincode_path, version, t) { var proposalResponses = results[0]; var proposal = results[1]; - var header = results[2]; var all_good = true; var errors = []; for(var i in proposalResponses) { @@ -318,7 +317,6 @@ function instantiateChaincode(userOrg, chaincode_path, version, upgrade, t){ var proposalResponses = results[0]; var proposal = results[1]; - var header = results[2]; var all_good = true; for(var i in proposalResponses) { let one_good = false; @@ -336,8 +334,7 @@ function instantiateChaincode(userOrg, chaincode_path, version, upgrade, t){ logger.debug(util.format('Successfully sent Proposal and received ProposalResponse: Status - %s, message - "%s", metadata - "%s", endorsement signature: %s', proposalResponses[0].response.status, proposalResponses[0].response.message, proposalResponses[0].response.payload, proposalResponses[0].endorsement.signature)); var request = { proposalResponses: proposalResponses, - proposal: proposal, - header: header + proposal: proposal }; // set the transaction listener and set a timeout of 30sec @@ -590,7 +587,6 @@ function invokeChaincode(userOrg, version, t, useStore){ var proposalResponses = pass_results[0]; var proposal = pass_results[1]; - var header = pass_results[2]; var all_good = true; for(var i in proposalResponses) { let one_good = false; @@ -624,8 +620,7 @@ function invokeChaincode(userOrg, version, t, useStore){ logger.debug(util.format('Successfully sent Proposal and received ProposalResponse: Status - %s, message - "%s", metadata - "%s", endorsement signature: %s', proposalResponses[0].response.status, proposalResponses[0].response.message, proposalResponses[0].response.payload, proposalResponses[0].endorsement.signature)); 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/eventutil.js b/test/integration/eventutil.js index d257ae67e4..f69c9b61b8 100644 --- a/test/integration/eventutil.js +++ b/test/integration/eventutil.js @@ -93,11 +93,9 @@ module.exports.sendTransaction = function(channel, results) { if (checkProposal(results)) { var proposalResponses = results[0]; var proposal = results[1]; - var header = results[2]; var request = { proposalResponses: proposalResponses, - proposal: proposal, - header: header + proposal: proposal }; return channel.sendTransaction(request); } else { diff --git a/test/integration/install.js b/test/integration/install.js index 969823d94e..94ed979846 100644 --- a/test/integration/install.js +++ b/test/integration/install.js @@ -218,7 +218,6 @@ function installChaincode(params, t) { var proposalResponses = results[0]; var proposal = results[1]; - var header = results[2]; var all_good = true; var error = null; for(var i in proposalResponses) {