LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

integration/rpctest: update API usage due to segwit

Browse source
This commit is contained in:
Olaoluwa Osuntokun 2017-05-11 14:10:05 -07:00 committed by Dave Collins
parent fad0d1d56c
commit 1405670930
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration/rpctest/blockgen.go
View file

@ -166,7 +166,7 @@ func CreateBlock(prevBlock *btcutil.Block, inclusionTxs []*btcutil.Tx,
if inclusionTxs != nil { if inclusionTxs != nil {
blockTxns = append(blockTxns, inclusionTxs...) blockTxns = append(blockTxns, inclusionTxs...)
} }
merkles := blockchain.BuildMerkleTreeStore(blockTxns) merkles := blockchain.BuildMerkleTreeStore(blockTxns, false)
var block wire.MsgBlock var block wire.MsgBlock
block.Header = wire.BlockHeader{ block.Header = wire.BlockHeader{
Version: blockVersion, Version: blockVersion,

2
integration/rpctest/memwallet.go
View file

@ -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 // Add the selected output to the transaction, updating the
// current tx size while accounting for the size of the future // current tx size while accounting for the size of the future
// sigScript. // sigScript.
tx.AddTxIn(wire.NewTxIn(&outPoint, nil)) tx.AddTxIn(wire.NewTxIn(&outPoint, nil, nil))
txSize = tx.SerializeSize() + spendSize*len(tx.TxIn) txSize = tx.SerializeSize() + spendSize*len(tx.TxIn)
// Calculate the fee required for the txn at this point // Calculate the fee required for the txn at this point