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

convenience for fromHex.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-10-23 16:22:39 -07:00
parent 323a7fb962
commit 5d8332c710
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
example/index.js
View File

@ -142,13 +142,6 @@ bitcoind.on('open', function(status) {
return getBlocks(bitcoind); return getBlocks(bitcoind);
} }
if (argv['test-tx']) {
var tx = bitcoind.tx.fromHex(testTx);
bitcoind.log(tx);
bitcoind.log(tx.txid === tx.getHash('hex'));
return;
}
function assertHex(obj) { function assertHex(obj) {
// Hash // Hash
if (obj.txid) { if (obj.txid) {
@ -200,12 +193,12 @@ bitcoind.on('open', function(status) {
// Test fromHex: // Test fromHex:
if (argv['from-hex']) { if (argv['from-hex']) {
var block = bitcoind.block.fromHex(testBlock); var block = bitcoind.block(testBlock);
assert.equal(block.hash, '0000000000013b8ab2cd513b0261a14096412195a72a0c4827d229dcc7e0f7af'); assert.equal(block.hash, '0000000000013b8ab2cd513b0261a14096412195a72a0c4827d229dcc7e0f7af');
assert.equal(block.merkleroot, '2fda58e5959b0ee53c5253da9b9f3c0c739422ae04946966991cf55895287552'); assert.equal(block.merkleroot, '2fda58e5959b0ee53c5253da9b9f3c0c739422ae04946966991cf55895287552');
bitcoind.log('Block:'); bitcoind.log('Block:');
bitcoind.log(block); bitcoind.log(block);
var tx = bitcoind.tx.fromHex(testTx); var tx = bitcoind.tx(testTx);
assert.equal(tx.txid, 'b4749f017444b051c44dfd2720e88f314ff94f3dd6d56d40ef65854fcd7fff6b'); assert.equal(tx.txid, 'b4749f017444b051c44dfd2720e88f314ff94f3dd6d56d40ef65854fcd7fff6b');
bitcoind.log('Transaction:'); bitcoind.log('Transaction:');
bitcoind.log(tx); bitcoind.log(tx);

8
lib/bitcoind.js
View File

@ -395,6 +395,10 @@ function Block(data) {
return new Block(data); return new Block(data);
} }
if (typeof data === 'string') {
return Block.fromHex(data);
}
if (data instanceof Block) { if (data instanceof Block) {
return data; return data;
} }
@ -478,6 +482,10 @@ function Transaction(data) {
return new Transaction(data); return new Transaction(data);
} }
if (typeof data === 'string') {
return Transaction.fromHex(data);
}
if (data instanceof Transaction) { if (data instanceof Transaction) {
return data; return data;
} }