From 1c6d5a28a968a63f87f3631a1f6ea0e3b040c8af Mon Sep 17 00:00:00 2001 From: Bez Reyhan Date: Mon, 15 Dec 2014 19:21:34 -0800 Subject: [PATCH] update fixtures and tests for merge --- test/fixtures/transaction.json | 5 +++++ test/transaction.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/fixtures/transaction.json b/test/fixtures/transaction.json index 9ddbfb0..32dad1d 100644 --- a/test/fixtures/transaction.json +++ b/test/fixtures/transaction.json @@ -65,6 +65,11 @@ "version": 1, "locktime": 0, "ins": [ + { + "hash": "2afdde042a49d7cf5c34c9ec2331049bb8cbc5841d7324748eab52bf10dfb954", + "index": 1, + "script": null + }, { "hash": "e7b73e229790c1e79a02f0c871813b3cf26a4156c5b8d942e88b38fe8d3f43a0", "index": 0, diff --git a/test/transaction.js b/test/transaction.js index 41f94f6..b54185e 100644 --- a/test/transaction.js +++ b/test/transaction.js @@ -117,7 +117,7 @@ describe('Transaction', function() { var script = txIn.script ? Script.fromASM(txIn.script) : undefined var j = tx.addInput(txHash, txIn.index, txIn.sequence, script) var sequence = txIn.sequence - if (sequence === undefined) { + if (sequence === undefined || sequence === null ) { sequence = Transaction.DEFAULT_SEQUENCE }