From dfcb04c9b44a6f9f0aa7aa9aae6dc35619b08913 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 14 Nov 2016 13:45:15 +1100 Subject: [PATCH] tests: add coinbase flag to each transaction fixture --- test/fixtures/transaction.json | 42 ++++++++++++++++++++++------------ test/transaction.js | 7 ++++-- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/test/fixtures/transaction.json b/test/fixtures/transaction.json index 7410cad..e044eb3 100644 --- a/test/fixtures/transaction.json +++ b/test/fixtures/transaction.json @@ -401,7 +401,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2SH P2PK", @@ -435,7 +436,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2WSH P2PK", @@ -472,7 +474,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2SH P2WSH P2PK", @@ -509,7 +512,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2PKH", @@ -543,7 +547,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2SH P2PKH", @@ -577,7 +582,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2WSH P2PKH", @@ -615,7 +621,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2SH P2WSH P2PKH", @@ -653,7 +660,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "Multisig", @@ -687,7 +695,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2SH Multisig", @@ -721,7 +730,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2WSH Multisig", @@ -759,7 +769,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2SH P2WSH Multisig", @@ -797,7 +808,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2WKH", @@ -834,7 +846,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false }, { "description": "P2SH P2WKH", @@ -871,7 +884,8 @@ } ], "locktime": 0 - } + }, + "coinbase": false } ] } \ No newline at end of file diff --git a/test/transaction.js b/test/transaction.js index 30b3d74..ed15167 100644 --- a/test/transaction.js +++ b/test/transaction.js @@ -193,13 +193,16 @@ describe('Transaction', function () { }) describe('isCoinbase', function () { - fixtures.valid.forEach(function (f) { + function verify (f) { it('should return ' + f.coinbase + ' for ' + f.id, function () { var tx = Transaction.fromHex(f.hex) assert.strictEqual(tx.isCoinbase(), f.coinbase) }) - }) + } + + fixtures.valid.forEach(verify) + fixtures.witness.forEach(verify) }) describe('hashForSignature', function () {