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

Merge pull request #359 from pnagurny/feature/main-chain

Browse Source 
add isMainChain to block
This commit is contained in:
Braydon Fuller 2015-09-09 11:20:46 -04:00
commit 2ae1cdbec2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/blocks.js
View File

@ -27,6 +27,7 @@ BlockController.prototype.block = function(req, res, next, hash) {
} }
var info = self.node.services.bitcoind.getBlockIndex(hash); var info = self.node.services.bitcoind.getBlockIndex(hash);
info.isMainChain = self.node.services.bitcoind.isMainChain(hash);
req.block = self.transformBlock(block, info); req.block = self.transformBlock(block, info);
next(); next();
@ -54,8 +55,8 @@ BlockController.prototype.transformBlock = function(block, info) {
previousblockhash: blockObj.header.prevHash, previousblockhash: blockObj.header.prevHash,
nextblockhash: null, // placeholder nextblockhash: null, // placeholder
reward: this.getBlockReward(info.height) / 1e8, reward: this.getBlockReward(info.height) / 1e8,
isMainChain: true // placeholder isMainChain: info.isMainChain
} };
}; };
/** /**

3
test/blocks.js
View File

@ -74,7 +74,8 @@ describe('Blocks', function() {
getBlock: sinon.stub().callsArgWith(1, null, bitcoreBlock), getBlock: sinon.stub().callsArgWith(1, null, bitcoreBlock),
services: { services: {
bitcoind: { bitcoind: {
getBlockIndex: sinon.stub().returns(blockIndexes['0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7']) getBlockIndex: sinon.stub().returns(blockIndexes['0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7']),
isMainChain: sinon.stub().returns(true)
}, },
db: { db: {
tip: { tip: {