update fixtures and tests for merge

This commit is contained in:
Bez Reyhan 2014-12-15 19:21:34 -08:00
parent 044c53bcad
commit 1c6d5a28a9
2 changed files with 6 additions and 1 deletions

View file

@ -65,6 +65,11 @@
"version": 1, "version": 1,
"locktime": 0, "locktime": 0,
"ins": [ "ins": [
{
"hash": "2afdde042a49d7cf5c34c9ec2331049bb8cbc5841d7324748eab52bf10dfb954",
"index": 1,
"script": null
},
{ {
"hash": "e7b73e229790c1e79a02f0c871813b3cf26a4156c5b8d942e88b38fe8d3f43a0", "hash": "e7b73e229790c1e79a02f0c871813b3cf26a4156c5b8d942e88b38fe8d3f43a0",
"index": 0, "index": 0,

View file

@ -117,7 +117,7 @@ describe('Transaction', function() {
var script = txIn.script ? Script.fromASM(txIn.script) : undefined var script = txIn.script ? Script.fromASM(txIn.script) : undefined
var j = tx.addInput(txHash, txIn.index, txIn.sequence, script) var j = tx.addInput(txHash, txIn.index, txIn.sequence, script)
var sequence = txIn.sequence var sequence = txIn.sequence
if (sequence === undefined) { if (sequence === undefined || sequence === null ) {
sequence = Transaction.DEFAULT_SEQUENCE sequence = Transaction.DEFAULT_SEQUENCE
} }