From 140567093046fcf5a7f7f7976cae9a263cc3fcd4 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 11 May 2017 14:10:05 -0700 Subject: [PATCH] integration/rpctest: update API usage due to segwit --- integration/rpctest/blockgen.go | 2 +- integration/rpctest/memwallet.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/rpctest/blockgen.go b/integration/rpctest/blockgen.go index fd3bfb8b..bf092f61 100644 --- a/integration/rpctest/blockgen.go +++ b/integration/rpctest/blockgen.go @@ -166,7 +166,7 @@ func CreateBlock(prevBlock *btcutil.Block, inclusionTxs []*btcutil.Tx, if inclusionTxs != nil { blockTxns = append(blockTxns, inclusionTxs...) } - merkles := blockchain.BuildMerkleTreeStore(blockTxns) + merkles := blockchain.BuildMerkleTreeStore(blockTxns, false) var block wire.MsgBlock block.Header = wire.BlockHeader{ Version: blockVersion, diff --git a/integration/rpctest/memwallet.go b/integration/rpctest/memwallet.go index f33fa818..10471d38 100644 --- a/integration/rpctest/memwallet.go +++ b/integration/rpctest/memwallet.go @@ -376,7 +376,7 @@ func (m *memWallet) fundTx(tx *wire.MsgTx, amt btcutil.Amount, feeRate btcutil.A // Add the selected output to the transaction, updating the // current tx size while accounting for the size of the future // sigScript. - tx.AddTxIn(wire.NewTxIn(&outPoint, nil)) + tx.AddTxIn(wire.NewTxIn(&outPoint, nil, nil)) txSize = tx.SerializeSize() + spendSize*len(tx.TxIn) // Calculate the fee required for the txn at this point