BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

include proposal type, exclude decorations, in txhistory results

This commit is contained in:
Gregg Zigler 2015-07-28 09:25:05 -07:00
parent 20487ab38a
commit 730a3269c9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/server.js
View File

@ -1532,6 +1532,7 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
amount = 0;
}
function outputMap(o) { return { amount: o.amount, address: o.address } };
var newTx = {
txid: tx.txid,
action: action,
@ -1539,13 +1540,14 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
fees: tx.fees,
time: tx.time,
addressTo: addressTo,
outputs: _.filter(outputs, { isChange: false }),
outputs: _.map(_.filter(outputs, { isChange: false }), outputMap),
confirmations: tx.confirmations,
};
var proposal = indexedProposals[tx.txid];
if (proposal) {
newTx.proposalId = proposal.id;
newTx.proposalType = proposal.type;
newTx.creatorName = proposal.creatorName;
newTx.message = proposal.message;
newTx.actions = _.map(proposal.actions, function(action) {

3
test/integration/server.js
View File

@ -3657,9 +3657,12 @@ describe('Wallet service', function() {
tx.actions.length.should.equal(1);
tx.actions[0].type.should.equal('accept');
tx.actions[0].copayerName.should.equal('copayer 1');
tx.proposalType.should.equal(Model.TxProposal.Types.MULTIPLEOUTPUTS);
tx.outputs[0].address.should.equal(external);
tx.outputs[0].amount.should.equal(helpers.toSatoshi(50));
should.not.exist(tx.outputs[0].message);
should.not.exist(tx.outputs[0]['isMine']);
should.not.exist(tx.outputs[0]['isChange']);
tx.outputs[1].address.should.equal(external);
tx.outputs[1].amount.should.equal(helpers.toSatoshi(30));
should.exist(tx.outputs[1].message);