From 7d4e1e17f07043951697b50f3c6627d3da5737dd Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Thu, 5 Feb 2015 23:36:19 -0600 Subject: [PATCH] Update btcnet path import paths to new location. --- wallet.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wallet.go b/wallet.go index 2f753f11..fead4211 100644 --- a/wallet.go +++ b/wallet.go @@ -8,9 +8,9 @@ import ( "encoding/json" "strconv" + "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcjson" - "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcws" ) @@ -879,7 +879,7 @@ func (r FutureAddMultisigAddressResult) Receive() (btcutil.Address, error) { return nil, err } - return btcutil.DecodeAddress(addr, &btcnet.MainNetParams) + return btcutil.DecodeAddress(addr, &chaincfg.MainNetParams) } // AddMultisigAddressAsync returns an instance of a type that can be used to get @@ -1010,7 +1010,7 @@ func (r FutureGetNewAddressResult) Receive() (btcutil.Address, error) { return nil, err } - return btcutil.DecodeAddress(addr, &btcnet.MainNetParams) + return btcutil.DecodeAddress(addr, &chaincfg.MainNetParams) } // GetNewAddressAsync returns an instance of a type that can be used to get the @@ -1053,7 +1053,7 @@ func (r FutureGetRawChangeAddressResult) Receive() (btcutil.Address, error) { return nil, err } - return btcutil.DecodeAddress(addr, &btcnet.MainNetParams) + return btcutil.DecodeAddress(addr, &chaincfg.MainNetParams) } // GetRawChangeAddressAsync returns an instance of a type that can be used to @@ -1097,7 +1097,7 @@ func (r FutureGetAccountAddressResult) Receive() (btcutil.Address, error) { return nil, err } - return btcutil.DecodeAddress(addr, &btcnet.MainNetParams) + return btcutil.DecodeAddress(addr, &chaincfg.MainNetParams) } // GetAccountAddressAsync returns an instance of a type that can be used to get @@ -1221,7 +1221,8 @@ func (r FutureGetAddressesByAccountResult) Receive() ([]btcutil.Address, error) addrs := make([]btcutil.Address, 0, len(addrStrings)) for _, addrStr := range addrStrings { - addr, err := btcutil.DecodeAddress(addrStr, &btcnet.MainNetParams) + addr, err := btcutil.DecodeAddress(addrStr, + &chaincfg.MainNetParams) if err != nil { return nil, err }