Skip to content

Commit

Permalink
[FAB-4964] NodeSDK - update test cases
Browse files Browse the repository at this point in the history
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 <beharrison@nc.rr.com>
  • Loading branch information
harrisob authored and jimthematrix committed Jun 25, 2017
1 parent 16c9318 commit 95502b6
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 18 deletions.
1 change: 0 additions & 1 deletion examples/balance-transfer/app/install-chaincode.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions examples/balance-transfer/app/instantiate-chaincode.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions examples/balance-transfer/app/invoke-transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down
9 changes: 2 additions & 7 deletions test/integration/e2e/e2eUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions test/integration/eventutil.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion test/integration/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 95502b6

Please sign in to comment.