RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #195 from pnagurny/bug/transaction-fee

Browse Source 
Handle getFee() error
This commit is contained in:
Braydon Fuller 2015-09-04 14:28:37 -04:00
commit 9aec734122
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/services/address.js
View File

@ -514,7 +514,8 @@ AddressService.prototype.getAddressHistoryForAddress = function(address, queryMe
height: transaction.__height, height: transaction.__height,
confirmations: confirmations, confirmations: confirmations,
timestamp: transaction.__timestamp, timestamp: transaction.__timestamp,
fees: transaction.getFee(), // TODO bitcore should return null instead of throwing error on coinbase
fees: !transaction.isCoinbase() ? transaction.getFee() : null,
outputIndexes: [], outputIndexes: [],
inputIndexes: [], inputIndexes: [],
tx: transaction tx: transaction

3
test/scaffold/create.integration.js
View File

@ -53,6 +53,9 @@ describe('#create', function() {
}); });
it('will create scaffold files', function() { it('will create scaffold files', function() {
delete process.env.BITCORENODE_DIR;
delete process.env.BITCORENODE_NETWORK;
delete process.env.BITCORENODE_PORT;
create({ create({
cwd: testDir, cwd: testDir,

3
test/scaffold/default-config.integration.js
View File

@ -7,6 +7,9 @@ describe('#defaultConfig', function() {
it('will return expected configuration', function() { it('will return expected configuration', function() {
var cwd = process.cwd(); var cwd = process.cwd();
delete process.env.BITCORENODE_DIR;
delete process.env.BITCORENODE_NETWORK;
delete process.env.BITCORENODE_PORT;
var home = process.env.HOME; var home = process.env.HOME;
var info = defaultConfig(); var info = defaultConfig();
info.path.should.equal(cwd); info.path.should.equal(cwd);

19
test/services/address.unit.js
View File

@ -767,7 +767,8 @@ describe('Address Service', function() {
height: 1, height: 1,
timestamp: 1438289011844, timestamp: 1438289011844,
satoshis: 5000, satoshis: 5000,
getFee: sinon.stub().returns(1000) getFee: sinon.stub().throws(new Error('inputs not populated')),
isCoinbase: sinon.stub().returns(true)
}, },
{ {
txid: 'tx3', txid: 'tx3',
@ -775,7 +776,8 @@ describe('Address Service', function() {
height: 3, height: 3,
timestamp: 1438289031844, timestamp: 1438289031844,
satoshis: 2000, satoshis: 2000,
getFee: sinon.stub().returns(1000) getFee: sinon.stub().returns(1000),
isCoinbase: sinon.stub().returns(false)
}, },
{ {
txid: 'tx4', txid: 'tx4',
@ -785,7 +787,8 @@ describe('Address Service', function() {
height: 4, height: 4,
timestamp: 1438289041844, timestamp: 1438289041844,
satoshis: 3000, satoshis: 3000,
getFee: sinon.stub().returns(1000) getFee: sinon.stub().returns(1000),
isCoinbase: sinon.stub().returns(false)
}, },
]; ];
@ -801,7 +804,8 @@ describe('Address Service', function() {
} }
} }
], ],
getFee: sinon.stub().returns(1000) getFee: sinon.stub().returns(1000),
isCoinbase: sinon.stub().returns(false)
}, },
{ {
txid: 'tx5', txid: 'tx5',
@ -815,7 +819,8 @@ describe('Address Service', function() {
} }
} }
], ],
getFee: sinon.stub().returns(1000) getFee: sinon.stub().returns(1000),
isCoinbase: sinon.stub().returns(false)
} }
]; ];
@ -836,6 +841,7 @@ describe('Address Service', function() {
transaction.__height = incoming[i].height; transaction.__height = incoming[i].height;
transaction.__timestamp = incoming[i].timestamp; transaction.__timestamp = incoming[i].timestamp;
transaction.getFee = incoming[i].getFee; transaction.getFee = incoming[i].getFee;
transaction.isCoinbase = incoming[i].isCoinbase;
return callback(null, transaction); return callback(null, transaction);
} }
} }
@ -850,6 +856,7 @@ describe('Address Service', function() {
transaction.__timestamp = outgoing[i].timestamp; transaction.__timestamp = outgoing[i].timestamp;
transaction.inputs = outgoing[i].inputs; transaction.inputs = outgoing[i].inputs;
transaction.getFee = outgoing[i].getFee; transaction.getFee = outgoing[i].getFee;
transaction.isCoinbase = outgoing[i].isCoinbase;
return callback(null, transaction); return callback(null, transaction);
} }
} }
@ -890,7 +897,7 @@ describe('Address Service', function() {
history[0].satoshis.should.equal(5000); history[0].satoshis.should.equal(5000);
history[0].height.should.equal(1); history[0].height.should.equal(1);
history[0].timestamp.should.equal(1438289011844); history[0].timestamp.should.equal(1438289011844);
history[0].fees.should.equal(1000); should.equal(history[0].fees, null);
history[1].tx.hash.should.equal('tx2'); history[1].tx.hash.should.equal('tx2');
history[1].satoshis.should.equal(-5000); history[1].satoshis.should.equal(-5000);
history[1].height.should.equal(2); history[1].height.should.equal(2);