RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: style concerns. fix type variable.

Browse Source 
Signed-off-by: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
Christopher Jeffrey 2014-05-18 12:40:13 -05:00 committed by Fedor Indutny
parent 810e4f5ea7
commit 745473784f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/bcoin/block.js
View File

@ -126,9 +126,13 @@ Block.fromJSON = function fromJSON(json) {
var raw = utils.toArray(json.block, 'hex'); var raw = utils.toArray(json.block, 'hex');
var block = new bcoin.block(json.subtype === 'merkleblock' var parser = new bcoin.protocol.parser();
? new bcoin.protocol.parser().parseMerkleBlock(raw)
: new bcoin.protocol.parser().parseBlock(raw), type); var data = json.subtype === 'merkleblock' ?
parser.parseMerkleBlock(raw) :
parser.parseBlock(raw);
var block = new bcoin.block(data, json.subtype);
block._hash = json.hash; block._hash = json.hash;