From 2971816588d4693f8c25ddfb911df1ecb909f7ac Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Fri, 7 Aug 2015 16:41:24 +1000
Subject: [PATCH] TxBuilder: pass network through to fromTransaction
---
src/transaction_builder.js | 4 ++--
test/transaction_builder.js | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/transaction_builder.js b/src/transaction_builder.js
index ff2041a..79318d3 100644
--- a/src/transaction_builder.js
+++ b/src/transaction_builder.js
@@ -94,8 +94,8 @@ function TransactionBuilder (network) {
this.tx = new Transaction()
}
-TransactionBuilder.fromTransaction = function (transaction) {
- var txb = new TransactionBuilder()
+TransactionBuilder.fromTransaction = function (transaction, network) {
+ var txb = new TransactionBuilder(/* remove after failing test added: network*/)
// Copy other transaction fields
txb.tx.version = transaction.version
diff --git a/test/transaction_builder.js b/test/transaction_builder.js
index b940430..60e69c1 100644
--- a/test/transaction_builder.js
+++ b/test/transaction_builder.js
@@ -209,6 +209,7 @@ describe('TransactionBuilder', function () {
if (f.txHex) {
var tx = Transaction.fromHex(f.txHex)
txb = TransactionBuilder.fromTransaction(tx)
+
} else {
txb = construct(f)
}
@@ -234,6 +235,7 @@ describe('TransactionBuilder', function () {
txb = construct(f, false)
var tx
+ var network = NETWORKS[f.network]
f.inputs.forEach(function (input, i) {
var redeemScript = Script.fromASM(input.redeemScript)
@@ -257,10 +259,10 @@ describe('TransactionBuilder', function () {
}
// now import it
- txb = TransactionBuilder.fromTransaction(tx)
+ txb = TransactionBuilder.fromTransaction(tx, network)
}
- var keyPair = ECPair.fromWIF(sign.keyPair, NETWORKS[f.network])
+ var keyPair = ECPair.fromWIF(sign.keyPair, network)
txb.sign(i, keyPair, redeemScript, sign.hashType)
// update the tx
@@ -294,8 +296,9 @@ describe('TransactionBuilder', function () {
describe('fromTransaction', function () {
fixtures.valid.build.forEach(function (f) {
it('builds the correct TransactionBuilder for ' + f.description, function () {
+ var network = NETWORKS[f.network]
var tx = Transaction.fromHex(f.txHex)
- var txb = TransactionBuilder.fromTransaction(tx)
+ var txb = TransactionBuilder.fromTransaction(tx, network)
assert.strictEqual(txb.build().toHex(), f.txHex)
})