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

bitcoind: camelCase result from getBlockHeader

Browse Source 
for consistency with other methods
This commit is contained in:
Braydon Fuller 2016-05-11 11:39:14 -04:00
parent d399e9acea
commit b597a05cb4
3 changed files with 88 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/services/bitcoind.js
View File

@ -1523,8 +1523,23 @@ Bitcoin.prototype.getBlockHeader = function(block, callback) {
if (err) {
return done(self._wrapRPCError(err));
}
// TODO format response prevHash instead of previousblockhash, etc.
done(null, response.result);
var result = response.result;
var header = {
hash: result.hash,
version: result.version,
confirmations: result.confirmations,
height: result.height,
chainWork: result.chainwork,
prevHash: result.previousblockhash,
nextHash: result.nextblockhash,
merkleRoot: result.merkleroot,
time: result.time,
medianTime: result.mediantime,
nonce: result.nonce,
bits: result.bits,
difficulty: result.difficulty
};
done(null, header);
});
}, callback);
}

18
regtest/bitcoind.js
View File

@ -268,13 +268,13 @@ describe('Bitcoind Functionality', function() {
return done(err);
}
should.exist(blockIndex);
should.exist(blockIndex.chainwork);
var work = new BN(blockIndex.chainwork, 'hex');
should.exist(blockIndex.chainWork);
var work = new BN(blockIndex.chainWork, 'hex');
work.toString(16).should.equal(expectedWork.toString(16));
expectedWork = expectedWork.add(new BN(2));
should.exist(blockIndex.previousblockhash);
should.exist(blockIndex.prevHash);
blockIndex.hash.should.equal(blockHashes[i]);
blockIndex.previousblockhash.should.equal(blockHashes[i - 1]);
blockIndex.prevHash.should.equal(blockHashes[i - 1]);
blockIndex.height.should.equal(i + 1);
done();
});
@ -286,7 +286,7 @@ describe('Bitcoind Functionality', function() {
return done(err);
}
should.exist(header);
should.equal(header.previousblockhash, undefined);
should.equal(header.prevHash, undefined);
done();
});
});
@ -304,13 +304,13 @@ describe('Bitcoind Functionality', function() {
it('generate block ' + i, function() {
bitcoind.getBlockHeader(i, function(err, header) {
should.exist(header);
should.exist(header.chainwork);
var work = new BN(header.chainwork, 'hex');
should.exist(header.chainWork);
var work = new BN(header.chainWork, 'hex');
work.toString(16).should.equal(expectedWork.toString(16));
expectedWork = expectedWork.add(new BN(2));
should.exist(header.previousblockhash);
should.exist(header.prevHash);
header.hash.should.equal(blockHashes[i - 1]);
header.previousblockhash.should.equal(blockHashes[i - 2]);
header.prevHash.should.equal(blockHashes[i - 2]);
header.height.should.equal(i);
});
});

68
test/services/bitcoind.unit.js
View File

@ -2746,9 +2746,37 @@ describe('Bitcoin Service', function() {
});
it('will give result from client getblockheader (from height)', function() {
var bitcoind = new BitcoinService(baseConfig);
var result = {};
var result = {
hash: '0000000000000a817cd3a74aec2f2246b59eb2cbb1ad730213e6c4a1d68ec2f6',
version: 536870912,
confirmations: 5,
height: 828781,
chainWork: '00000000000000000000000000000000000000000000000ad467352c93bc6a3b',
prevHash: '0000000000000504235b2aff578a48470dbf6b94dafa9b3703bbf0ed554c9dd9',
nextHash: '00000000000000eedd967ec155f237f033686f0924d574b946caf1b0e89551b8',
merkleRoot: '124e0f3fb5aa268f102b0447002dd9700988fc570efcb3e0b5b396ac7db437a9',
time: 1462979126,
medianTime: 1462976771,
nonce: 2981820714,
bits: '1a13ca10',
difficulty: 847779.0710240941
};
var getBlockHeader = sinon.stub().callsArgWith(1, null, {
result: result
result: {
hash: '0000000000000a817cd3a74aec2f2246b59eb2cbb1ad730213e6c4a1d68ec2f6',
version: 536870912,
confirmations: 5,
height: 828781,
chainwork: '00000000000000000000000000000000000000000000000ad467352c93bc6a3b',
previousblockhash: '0000000000000504235b2aff578a48470dbf6b94dafa9b3703bbf0ed554c9dd9',
nextblockhash: '00000000000000eedd967ec155f237f033686f0924d574b946caf1b0e89551b8',
merkleroot: '124e0f3fb5aa268f102b0447002dd9700988fc570efcb3e0b5b396ac7db437a9',
time: 1462979126,
mediantime: 1462976771,
nonce: 2981820714,
bits: '1a13ca10',
difficulty: 847779.0710240941
}
});
var getBlockHash = sinon.stub().callsArgWith(1, null, {
result: blockhash
@ -2762,14 +2790,42 @@ describe('Bitcoin Service', function() {
bitcoind.getBlockHeader(0, function(err, blockHeader) {
should.not.exist(err);
getBlockHeader.args[0][0].should.equal(blockhash);
blockHeader.should.equal(result);
blockHeader.should.deep.equal(result);
});
});
it('will give result from client getblockheader (from hash)', function() {
var bitcoind = new BitcoinService(baseConfig);
var result = {};
var result = {
hash: '0000000000000a817cd3a74aec2f2246b59eb2cbb1ad730213e6c4a1d68ec2f6',
version: 536870912,
confirmations: 5,
height: 828781,
chainWork: '00000000000000000000000000000000000000000000000ad467352c93bc6a3b',
prevHash: '0000000000000504235b2aff578a48470dbf6b94dafa9b3703bbf0ed554c9dd9',
nextHash: '00000000000000eedd967ec155f237f033686f0924d574b946caf1b0e89551b8',
merkleRoot: '124e0f3fb5aa268f102b0447002dd9700988fc570efcb3e0b5b396ac7db437a9',
time: 1462979126,
medianTime: 1462976771,
nonce: 2981820714,
bits: '1a13ca10',
difficulty: 847779.0710240941
};
var getBlockHeader = sinon.stub().callsArgWith(1, null, {
result: result
result: {
hash: '0000000000000a817cd3a74aec2f2246b59eb2cbb1ad730213e6c4a1d68ec2f6',
version: 536870912,
confirmations: 5,
height: 828781,
chainwork: '00000000000000000000000000000000000000000000000ad467352c93bc6a3b',
previousblockhash: '0000000000000504235b2aff578a48470dbf6b94dafa9b3703bbf0ed554c9dd9',
nextblockhash: '00000000000000eedd967ec155f237f033686f0924d574b946caf1b0e89551b8',
merkleroot: '124e0f3fb5aa268f102b0447002dd9700988fc570efcb3e0b5b396ac7db437a9',
time: 1462979126,
mediantime: 1462976771,
nonce: 2981820714,
bits: '1a13ca10',
difficulty: 847779.0710240941
}
});
var getBlockHash = sinon.stub();
bitcoind.nodes.push({
@ -2781,7 +2837,7 @@ describe('Bitcoin Service', function() {
bitcoind.getBlockHeader(blockhash, function(err, blockHeader) {
should.not.exist(err);
getBlockHash.callCount.should.equal(0);
blockHeader.should.equal(result);
blockHeader.should.deep.equal(result);
});
});
});