diff --git a/lib/blocks.js b/lib/blocks.js index ff174cc..f7f97ae 100644 --- a/lib/blocks.js +++ b/lib/blocks.js @@ -113,10 +113,10 @@ BlockController.prototype.transformBlock = function(block, info) { nonce: blockObj.header.nonce, bits: blockObj.header.bits.toString(16), difficulty: block.header.getDifficulty(), - chainwork: info.chainwork, + chainwork: info.chainWork, confirmations: info.confirmations, previousblockhash: this._normalizePrevHash(blockObj.header.prevHash), - nextblockhash: info.nextblockhash, + nextblockhash: info.nextHash, reward: this.getBlockReward(info.height) / 1e8, isMainChain: (info.confirmations !== -1), poolInfo: this.getPoolInfo(block) diff --git a/test/blocks.js b/test/blocks.js index 88073c9..f88cdec 100644 --- a/test/blocks.js +++ b/test/blocks.js @@ -11,34 +11,34 @@ var blocks = require('./data/blocks.json'); var blockIndexes = { '0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7': { hash: '0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7', - chainwork: '0000000000000000000000000000000000000000000000054626b1839ade284a', - previousblockhash: '00000000000001a55f3214e9172eb34b20e0bc5bd6b8007f3f149fca2c8991a4', - nextblockhash: '000000000001e866a8057cde0c650796cb8a59e0e6038dc31c69d7ca6649627d', + chainWork: '0000000000000000000000000000000000000000000000054626b1839ade284a', + prevHash: '00000000000001a55f3214e9172eb34b20e0bc5bd6b8007f3f149fca2c8991a4', + nextHash: '000000000001e866a8057cde0c650796cb8a59e0e6038dc31c69d7ca6649627d', confirmations: 119, height: 533974 }, '000000000008fbb2e358e382a6f6948b2da24563bba183af447e6e2542e8efc7': { hash: '000000000008fbb2e358e382a6f6948b2da24563bba183af447e6e2542e8efc7', - chainwork: '00000000000000000000000000000000000000000000000544ea52e1575ca753', - previousblockhash: '00000000000006bd8fe9e53780323c0e85719eca771022e1eb6d10c62195c441', + chainWork: '00000000000000000000000000000000000000000000000544ea52e1575ca753', + prevHash: '00000000000006bd8fe9e53780323c0e85719eca771022e1eb6d10c62195c441', confirmations: 119, height: 533951 }, '00000000000006bd8fe9e53780323c0e85719eca771022e1eb6d10c62195c441': { hash: '00000000000006bd8fe9e53780323c0e85719eca771022e1eb6d10c62195c441', - chainwork: '00000000000000000000000000000000000000000000000544ea52e0575ba752', - previousblockhash: '000000000001b9c41e6c4a7b81a068b50cf3f522ee4ac1e942e75ec16e090547', + chainWork: '00000000000000000000000000000000000000000000000544ea52e0575ba752', + prevHash: '000000000001b9c41e6c4a7b81a068b50cf3f522ee4ac1e942e75ec16e090547', height: 533950 }, '000000000000000004a118407a4e3556ae2d5e882017e7ce526659d8073f13a4': { hash: '000000000000000004a118407a4e3556ae2d5e882017e7ce526659d8073f13a4', - previousblockhash: '00000000000000000a9d74a7b527f7b995fc21ceae5aa21087b443469351a362', + prevHash: '00000000000000000a9d74a7b527f7b995fc21ceae5aa21087b443469351a362', height: 375493 }, 533974: { hash: '0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7', - chainwork: '0000000000000000000000000000000000000000000000054626b1839ade284a', - previousblockhash: '00000000000001a55f3214e9172eb34b20e0bc5bd6b8007f3f149fca2c8991a4', + chainWork: '0000000000000000000000000000000000000000000000054626b1839ade284a', + prevHash: '00000000000001a55f3214e9172eb34b20e0bc5bd6b8007f3f149fca2c8991a4', height: 533974 } }; @@ -85,6 +85,7 @@ describe('Blocks', function() { it('block data should be correct', function(done) { var controller = new BlockController({node: node}); + var hash = '0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7'; var req = { params: { blockHash: hash @@ -97,9 +98,6 @@ describe('Blocks', function() { should(block).eql(insight); done(); }; - - var hash = '0000000000000afa0c3c0afd450c793a1e300ec84cbe9555166e06132f19a8f7'; - controller.block(req, res, next); });