LBRYCommunity/lbcutil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update btcscript import paths to new location.

Browse source
This commit is contained in:
Dave Collins 2015-01-30 12:11:32 -06:00
parent dca623d4ef
commit b29aad9f09
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bloom/filter.go
View file

@ -9,7 +9,7 @@ import (
"math" "math"
"sync" "sync"
"github.com/btcsuite/btcscript" "github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwire" "github.com/btcsuite/btcwire"
) )
@ -255,8 +255,8 @@ func (bf *Filter) maybeAddOutpoint(pkScript []byte, outHash *btcwire.ShaHash, ou
outpoint := btcwire.NewOutPoint(outHash, outIdx) outpoint := btcwire.NewOutPoint(outHash, outIdx)
bf.addOutPoint(outpoint) bf.addOutPoint(outpoint)
case btcwire.BloomUpdateP2PubkeyOnly: case btcwire.BloomUpdateP2PubkeyOnly:
class := btcscript.GetScriptClass(pkScript) class := txscript.GetScriptClass(pkScript)
if class == btcscript.PubKeyTy || class == btcscript.MultiSigTy { if class == txscript.PubKeyTy || class == txscript.MultiSigTy {
outpoint := btcwire.NewOutPoint(outHash, outIdx) outpoint := btcwire.NewOutPoint(outHash, outIdx)
bf.addOutPoint(outpoint) bf.addOutPoint(outpoint)
} }
@ -283,7 +283,7 @@ func (bf *Filter) matchTxAndUpdate(tx *btcutil.Tx) bool {
// from the client and avoids some potential races that could otherwise // from the client and avoids some potential races that could otherwise
// occur. // occur.
for i, txOut := range tx.MsgTx().TxOut { for i, txOut := range tx.MsgTx().TxOut {
pushedData, err := btcscript.PushedData(txOut.PkScript) pushedData, err := txscript.PushedData(txOut.PkScript)
if err != nil { if err != nil {
continue continue
} }
@ -314,7 +314,7 @@ func (bf *Filter) matchTxAndUpdate(tx *btcutil.Tx) bool {
return true return true
} }
pushedData, err := btcscript.PushedData(txin.SignatureScript) pushedData, err := txscript.PushedData(txin.SignatureScript)
if err != nil { if err != nil {
continue continue
} }

2
coinset/coins.go
View file

@ -377,7 +377,7 @@ func (c *SimpleCoin) Value() btcutil.Amount {
// //
// This can be used to determine what type of script the Coin uses // This can be used to determine what type of script the Coin uses
// and extract standard addresses if possible using // and extract standard addresses if possible using
// btcscript.ExtractPkScriptAddrs for example. // txscript.ExtractPkScriptAddrs for example.
func (c *SimpleCoin) PkScript() []byte { func (c *SimpleCoin) PkScript() []byte {
return c.txOut().PkScript return c.txOut().PkScript
} }