From 738574d6b1d4c41ec4969e29b44df48fa25fd55f Mon Sep 17 00:00:00 2001 From: Patrick Nagurny Date: Fri, 14 Aug 2015 16:28:51 -0400 Subject: [PATCH] add fees to address history --- lib/modules/address.js | 1 + test/modules/address.unit.js | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lib/modules/address.js b/lib/modules/address.js index abf3689c..5f4fecf1 100644 --- a/lib/modules/address.js +++ b/lib/modules/address.js @@ -502,6 +502,7 @@ AddressModule.prototype.getAddressHistoryForAddress = function(address, queryMem height: transaction.__height, confirmations: self.db.chain.tip.__height - transaction.__height + 1, timestamp: transaction.__timestamp, + fees: transaction.getFee(), outputIndexes: [], inputIndexes: [], tx: transaction diff --git a/test/modules/address.unit.js b/test/modules/address.unit.js index bb528588..bda520da 100644 --- a/test/modules/address.unit.js +++ b/test/modules/address.unit.js @@ -633,14 +633,16 @@ describe('AddressModule', function() { inputIndex: 0, height: 1, timestamp: 1438289011844, - satoshis: 5000 + satoshis: 5000, + getFee: sinon.stub().returns(1000) }, { txid: 'tx3', outputIndex: 1, height: 3, timestamp: 1438289031844, - satoshis: 2000 + satoshis: 2000, + getFee: sinon.stub().returns(1000) }, { txid: 'tx4', @@ -649,7 +651,8 @@ describe('AddressModule', function() { inputIndex: 1, height: 4, timestamp: 1438289041844, - satoshis: 3000 + satoshis: 3000, + getFee: sinon.stub().returns(1000) }, ]; @@ -664,7 +667,8 @@ describe('AddressModule', function() { satoshis: 5000 } } - ] + ], + getFee: sinon.stub().returns(1000) }, { txid: 'tx5', @@ -677,7 +681,8 @@ describe('AddressModule', function() { satoshis: 3000 } } - ] + ], + getFee: sinon.stub().returns(1000) } ]; @@ -694,6 +699,7 @@ describe('AddressModule', function() { transaction.hash = txid; transaction.__height = incoming[i].height; transaction.__timestamp = incoming[i].timestamp; + transaction.getFee = incoming[i].getFee; return callback(null, transaction); } } @@ -707,6 +713,7 @@ describe('AddressModule', function() { transaction.__height = outgoing[i].height; transaction.__timestamp = outgoing[i].timestamp; transaction.inputs = outgoing[i].inputs; + transaction.getFee = outgoing[i].getFee; return callback(null, transaction); } } @@ -747,22 +754,27 @@ describe('AddressModule', function() { history[0].satoshis.should.equal(5000); history[0].height.should.equal(1); history[0].timestamp.should.equal(1438289011844); + history[0].fees.should.equal(1000); history[1].tx.hash.should.equal('tx2'); history[1].satoshis.should.equal(-5000); history[1].height.should.equal(2); history[1].timestamp.should.equal(1438289021844); + history[1].fees.should.equal(1000); history[2].tx.hash.should.equal('tx3'); history[2].satoshis.should.equal(2000); history[2].height.should.equal(3); history[2].timestamp.should.equal(1438289031844); + history[2].fees.should.equal(1000); history[3].tx.hash.should.equal('tx4'); history[3].satoshis.should.equal(3000); history[3].height.should.equal(4); history[3].timestamp.should.equal(1438289041844); + history[3].fees.should.equal(1000); history[4].tx.hash.should.equal('tx5'); history[4].satoshis.should.equal(-3000); history[4].height.should.equal(5); history[4].timestamp.should.equal(1438289051844); + history[4].fees.should.equal(1000); done(); }); });