From 77b756c651d2b01777bdb0a5a0d821f901743b7e Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 5 May 2016 12:04:36 -0700 Subject: [PATCH] multi: point all imports towards roasbeef's forks --- btcwallet.go | 6 +++--- chain/chain.go | 3 +-- cmd/sweepaccount/main.go | 3 +-- internal/cfgutil/amount.go | 2 +- internal/helpers/helpers.go | 4 ++-- internal/legacy/keystore/keystore.go | 3 ++- internal/legacy/keystore/keystore_test.go | 1 - internal/prompt/prompt.go | 4 ++-- internal/rpchelp/genrpcserverhelp.go | 4 ++-- internal/rpchelp/methods.go | 2 +- internal/zero/benchmark_test.go | 2 +- internal/zero/zero_test.go | 2 +- log.go | 1 - netparams/params.go | 2 +- params.go | 2 +- rpc/legacyrpc/errors.go | 2 +- rpc/legacyrpc/rpchelp_test.go | 4 ++-- rpc/rpcserver/server.go | 5 ++--- rpcserver.go | 8 ++++---- votingpool/common_test.go | 2 +- votingpool/db.go | 10 +++++----- votingpool/db_wb_test.go | 2 +- votingpool/error_test.go | 2 +- votingpool/example_test.go | 16 ++++++++-------- votingpool/input_selection.go | 8 ++++---- votingpool/internal_test.go | 8 ++++---- votingpool/pool.go | 12 ++++++------ votingpool/pool_test.go | 10 +++++----- votingpool/pool_wb_test.go | 4 ++-- votingpool/withdrawal_test.go | 6 +++--- votingpool/withdrawal_wb_test.go | 16 ++++++++-------- waddrmgr/address.go | 10 +++++----- waddrmgr/common_test.go | 8 ++++---- waddrmgr/error.go | 2 +- waddrmgr/error_test.go | 2 +- waddrmgr/internal_test.go | 2 +- wallet/chainntfns.go | 8 ++++---- wallet/internal/txsizes/size.go | 4 ++-- wallet/internal/txsizes/size_test.go | 4 ++-- wallet/loader.go | 8 ++++---- wallet/rescan.go | 10 +++++----- wallet/txauthor/author.go | 14 +++++++------- wallet/txauthor/author_test.go | 10 +++++----- wallet/txrules/rules.go | 6 +++--- wallet/wallet.go | 1 - walletdb/bdb/driver.go | 2 +- walletdb/bdb/driver_test.go | 4 ++-- walletdb/bdb/interface_test.go | 2 +- walletdb/db_test.go | 4 ++-- walletdb/example_test.go | 12 ++++++------ walletdb/interface_test.go | 2 +- walletsetup.go | 20 ++++++++++---------- 52 files changed, 143 insertions(+), 148 deletions(-) diff --git a/btcwallet.go b/btcwallet.go index b3be088..41aa290 100644 --- a/btcwallet.go +++ b/btcwallet.go @@ -13,9 +13,9 @@ import ( "runtime" "sync" - "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/rpc/legacyrpc" - "github.com/btcsuite/btcwallet/wallet" + "github.com/roasbeef/btcwallet/chain" + "github.com/roasbeef/btcwallet/rpc/legacyrpc" + "github.com/roasbeef/btcwallet/wallet" ) var ( diff --git a/chain/chain.go b/chain/chain.go index 4c371b5..85b1208 100644 --- a/chain/chain.go +++ b/chain/chain.go @@ -12,7 +12,6 @@ import ( "github.com/btcsuite/btcd/btcjson" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wtxmgr" @@ -368,7 +367,7 @@ out: // loop from blocking here forever, but this is much larger // than it needs to be due to btcd processing websocket // requests synchronously (see - // https://github.com/btcsuite/btcd/issues/504). Decrease + // https://github.com/roasbeef/btcd/issues/504). Decrease // this to something saner like 3s when the above issue is // fixed. type sessionResult struct { diff --git a/cmd/sweepaccount/main.go b/cmd/sweepaccount/main.go index edca1d0..f21f4e5 100644 --- a/cmd/sweepaccount/main.go +++ b/cmd/sweepaccount/main.go @@ -14,14 +14,13 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/internal/cfgutil" "github.com/btcsuite/btcwallet/netparams" "github.com/btcsuite/btcwallet/wallet/txauthor" "github.com/btcsuite/btcwallet/wallet/txrules" "github.com/btcsuite/golangcrypto/ssh/terminal" "github.com/jessevdk/go-flags" + "github.com/roasbeef/btcwallet/internal/cfgutil" ) var ( diff --git a/internal/cfgutil/amount.go b/internal/cfgutil/amount.go index 5fa9c0c..18b5282 100644 --- a/internal/cfgutil/amount.go +++ b/internal/cfgutil/amount.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcutil" ) // AmountFlag embeds a btcutil.Amount and implements the flags.Marshaler and diff --git a/internal/helpers/helpers.go b/internal/helpers/helpers.go index 9bf3e42..e8a43b3 100644 --- a/internal/helpers/helpers.go +++ b/internal/helpers/helpers.go @@ -7,8 +7,8 @@ package helpers import ( - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) // SumOutputValues sums up the list of TxOuts and returns an Amount. diff --git a/internal/legacy/keystore/keystore.go b/internal/legacy/keystore/keystore.go index 27ed8ab..f671f18 100644 --- a/internal/legacy/keystore/keystore.go +++ b/internal/legacy/keystore/keystore.go @@ -22,6 +22,8 @@ import ( "sync" "time" + "golang.org/x/crypto/ripemd160" + "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg/chainhash" @@ -29,7 +31,6 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/internal/legacy/rename" - "github.com/btcsuite/golangcrypto/ripemd160" ) const ( diff --git a/internal/legacy/keystore/keystore_test.go b/internal/legacy/keystore/keystore_test.go index a5550ef..2119e4f 100644 --- a/internal/legacy/keystore/keystore_test.go +++ b/internal/legacy/keystore/keystore_test.go @@ -16,7 +16,6 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcutil" - "github.com/davecgh/go-spew/spew" ) diff --git a/internal/prompt/prompt.go b/internal/prompt/prompt.go index 817f912..96f160c 100644 --- a/internal/prompt/prompt.go +++ b/internal/prompt/prompt.go @@ -12,8 +12,8 @@ import ( "os" "strings" - "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/internal/legacy/keystore" + "github.com/roasbeef/btcutil/hdkeychain" + "github.com/roasbeef/btcwallet/internal/legacy/keystore" "github.com/btcsuite/golangcrypto/ssh/terminal" ) diff --git a/internal/rpchelp/genrpcserverhelp.go b/internal/rpchelp/genrpcserverhelp.go index e1ef856..07db190 100644 --- a/internal/rpchelp/genrpcserverhelp.go +++ b/internal/rpchelp/genrpcserverhelp.go @@ -12,8 +12,8 @@ import ( "os" "strings" - "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcwallet/internal/rpchelp" + "github.com/roasbeef/btcd/btcjson" + "github.com/roasbeef/btcwallet/internal/rpchelp" ) var outputFile = func() *os.File { diff --git a/internal/rpchelp/methods.go b/internal/rpchelp/methods.go index cdc4fad..04e42be 100644 --- a/internal/rpchelp/methods.go +++ b/internal/rpchelp/methods.go @@ -6,7 +6,7 @@ package rpchelp -import "github.com/btcsuite/btcd/btcjson" +import "github.com/roasbeef/btcd/btcjson" // Common return types. var ( diff --git a/internal/zero/benchmark_test.go b/internal/zero/benchmark_test.go index ade0a90..becfe21 100644 --- a/internal/zero/benchmark_test.go +++ b/internal/zero/benchmark_test.go @@ -7,7 +7,7 @@ package zero_test import ( "testing" - . "github.com/btcsuite/btcwallet/internal/zero" + . "github.com/roasbeef/btcwallet/internal/zero" ) var ( diff --git a/internal/zero/zero_test.go b/internal/zero/zero_test.go index 996e838..e8fb0be 100644 --- a/internal/zero/zero_test.go +++ b/internal/zero/zero_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - . "github.com/btcsuite/btcwallet/internal/zero" + . "github.com/roasbeef/btcwallet/internal/zero" ) func makeOneBytes(n int) []byte { diff --git a/log.go b/log.go index 4d97376..9d6670e 100644 --- a/log.go +++ b/log.go @@ -10,7 +10,6 @@ import ( "path/filepath" "github.com/btcsuite/btclog" - "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/rpc/legacyrpc" "github.com/btcsuite/btcwallet/rpc/rpcserver" diff --git a/netparams/params.go b/netparams/params.go index c15047e..77bd717 100644 --- a/netparams/params.go +++ b/netparams/params.go @@ -4,7 +4,7 @@ package netparams -import "github.com/btcsuite/btcd/chaincfg" +import "github.com/roasbeef/btcd/chaincfg" // Params is used to group parameters for various networks such as the main // network and test networks. diff --git a/params.go b/params.go index b668762..7cb2da1 100644 --- a/params.go +++ b/params.go @@ -4,6 +4,6 @@ package main -import "github.com/btcsuite/btcwallet/netparams" +import "github.com/roasbeef/btcwallet/netparams" var activeNet = &netparams.MainNetParams diff --git a/rpc/legacyrpc/errors.go b/rpc/legacyrpc/errors.go index 2116572..4f9b0d3 100644 --- a/rpc/legacyrpc/errors.go +++ b/rpc/legacyrpc/errors.go @@ -7,7 +7,7 @@ package legacyrpc import ( "errors" - "github.com/btcsuite/btcd/btcjson" + "github.com/roasbeef/btcd/btcjson" ) // TODO(jrick): There are several error paths which 'replace' various errors diff --git a/rpc/legacyrpc/rpchelp_test.go b/rpc/legacyrpc/rpchelp_test.go index 177ccb9..707d1f0 100644 --- a/rpc/legacyrpc/rpchelp_test.go +++ b/rpc/legacyrpc/rpchelp_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcwallet/internal/rpchelp" + "github.com/roasbeef/btcd/btcjson" + "github.com/roasbeef/btcwallet/internal/rpchelp" ) func serverMethods() map[string]struct{} { diff --git a/rpc/rpcserver/server.go b/rpc/rpcserver/server.go index 5f3222e..3cba7d3 100644 --- a/rpc/rpcserver/server.go +++ b/rpc/rpcserver/server.go @@ -8,11 +8,11 @@ // Full documentation of the API implemented by this package is maintained in a // language-agnostic document: // -// https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/api.md +// https://github.com/roasbeef/btcwallet/blob/master/rpc/documentation/api.md // // Any API changes must be performed according to the steps listed here: // -// https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/serverchanges.md +// https://github.com/roasbeef/btcwallet/blob/master/rpc/documentation/serverchanges.md package rpcserver import ( @@ -28,7 +28,6 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" "github.com/btcsuite/btcwallet/chain" diff --git a/rpcserver.go b/rpcserver.go index 5169b39..26b96bd 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -16,10 +16,10 @@ import ( "strings" "time" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/rpc/legacyrpc" - "github.com/btcsuite/btcwallet/rpc/rpcserver" - "github.com/btcsuite/btcwallet/wallet" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/rpc/legacyrpc" + "github.com/roasbeef/btcwallet/rpc/rpcserver" + "github.com/roasbeef/btcwallet/wallet" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/votingpool/common_test.go b/votingpool/common_test.go index d321b9f..d8c5a73 100644 --- a/votingpool/common_test.go +++ b/votingpool/common_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/btcsuite/btclog" - "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/waddrmgr" ) func init() { diff --git a/votingpool/db.go b/votingpool/db.go index 098f588..62a1f9f 100644 --- a/votingpool/db.go +++ b/votingpool/db.go @@ -10,11 +10,11 @@ import ( "encoding/gob" "fmt" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/snacl" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/snacl" + "github.com/roasbeef/btcwallet/walletdb" ) // These constants define the serialized length for a given encrypted extended diff --git a/votingpool/db_wb_test.go b/votingpool/db_wb_test.go index 3d9d21e..29f8b5c 100644 --- a/votingpool/db_wb_test.go +++ b/votingpool/db_wb_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcwallet/walletdb" ) func TestPutUsedAddrHash(t *testing.T) { diff --git a/votingpool/error_test.go b/votingpool/error_test.go index 0ada043..56af709 100644 --- a/votingpool/error_test.go +++ b/votingpool/error_test.go @@ -7,7 +7,7 @@ package votingpool_test import ( "testing" - vp "github.com/btcsuite/btcwallet/votingpool" + vp "github.com/roasbeef/btcwallet/votingpool" ) // TestErrorCodeStringer tests that all error codes has a text diff --git a/votingpool/example_test.go b/votingpool/example_test.go index ffbcdf3..1e87b60 100644 --- a/votingpool/example_test.go +++ b/votingpool/example_test.go @@ -23,14 +23,14 @@ import ( "os" "path/filepath" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/votingpool" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" - "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/votingpool" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/walletdb" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcwallet/wtxmgr" ) var ( diff --git a/votingpool/input_selection.go b/votingpool/input_selection.go index 4596714..511bea8 100644 --- a/votingpool/input_selection.go +++ b/votingpool/input_selection.go @@ -21,10 +21,10 @@ import ( "fmt" "sort" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/wtxmgr" ) const eligibleInputMinConfirmations = 100 diff --git a/votingpool/internal_test.go b/votingpool/internal_test.go index 9fb25af..62e0541 100644 --- a/votingpool/internal_test.go +++ b/votingpool/internal_test.go @@ -5,10 +5,10 @@ package votingpool import ( - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil/hdkeychain" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/walletdb" ) var TstLastErr = lastErr diff --git a/votingpool/pool.go b/votingpool/pool.go index 15a6cf7..d85264c 100644 --- a/votingpool/pool.go +++ b/votingpool/pool.go @@ -8,12 +8,12 @@ import ( "fmt" "sort" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/internal/zero" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/hdkeychain" + "github.com/roasbeef/btcwallet/internal/zero" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/walletdb" ) const ( diff --git a/votingpool/pool_test.go b/votingpool/pool_test.go index 3ee09be..4e51a73 100644 --- a/votingpool/pool_test.go +++ b/votingpool/pool_test.go @@ -11,11 +11,11 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcutil/hdkeychain" - vp "github.com/btcsuite/btcwallet/votingpool" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcutil/hdkeychain" + vp "github.com/roasbeef/btcwallet/votingpool" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/walletdb" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) func TestLoadPoolAndDepositScript(t *testing.T) { diff --git a/votingpool/pool_wb_test.go b/votingpool/pool_wb_test.go index effb3b3..03ca2b7 100644 --- a/votingpool/pool_wb_test.go +++ b/votingpool/pool_wb_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/roasbeef/btcutil/hdkeychain" + "github.com/roasbeef/btcwallet/waddrmgr" ) func TestPoolEnsureUsedAddr(t *testing.T) { diff --git a/votingpool/withdrawal_test.go b/votingpool/withdrawal_test.go index 673699b..4a27f08 100644 --- a/votingpool/withdrawal_test.go +++ b/votingpool/withdrawal_test.go @@ -8,9 +8,9 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/hdkeychain" - vp "github.com/btcsuite/btcwallet/votingpool" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/hdkeychain" + vp "github.com/roasbeef/btcwallet/votingpool" ) func TestStartWithdrawal(t *testing.T) { diff --git a/votingpool/withdrawal_wb_test.go b/votingpool/withdrawal_wb_test.go index b8236bf..5d77819 100644 --- a/votingpool/withdrawal_wb_test.go +++ b/votingpool/withdrawal_wb_test.go @@ -10,14 +10,14 @@ import ( "sort" "testing" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/walletdb" - "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/hdkeychain" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/walletdb" + "github.com/roasbeef/btcwallet/wtxmgr" ) // TestOutputSplittingNotEnoughInputs checks that an output will get split if we diff --git a/waddrmgr/address.go b/waddrmgr/address.go index e3b9210..cc3fe17 100644 --- a/waddrmgr/address.go +++ b/waddrmgr/address.go @@ -9,11 +9,11 @@ import ( "fmt" "sync" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcwallet/internal/zero" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/hdkeychain" + "github.com/roasbeef/btcwallet/internal/zero" ) // AddressType represents the various address types waddrmgr is currently able diff --git a/waddrmgr/common_test.go b/waddrmgr/common_test.go index be6f08b..cbcae56 100644 --- a/waddrmgr/common_test.go +++ b/waddrmgr/common_test.go @@ -11,10 +11,10 @@ import ( "path/filepath" "testing" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/walletdb" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) var ( diff --git a/waddrmgr/error.go b/waddrmgr/error.go index 524a607..69a7145 100644 --- a/waddrmgr/error.go +++ b/waddrmgr/error.go @@ -8,7 +8,7 @@ import ( "fmt" "strconv" - "github.com/btcsuite/btcutil/hdkeychain" + "github.com/roasbeef/btcutil/hdkeychain" ) var ( diff --git a/waddrmgr/error_test.go b/waddrmgr/error_test.go index 398308b..1bee941 100644 --- a/waddrmgr/error_test.go +++ b/waddrmgr/error_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/waddrmgr" ) // TestErrorCodeStringer tests the stringized output for the ErrorCode type. diff --git a/waddrmgr/internal_test.go b/waddrmgr/internal_test.go index 15a8c82..2942588 100644 --- a/waddrmgr/internal_test.go +++ b/waddrmgr/internal_test.go @@ -14,7 +14,7 @@ package waddrmgr import ( "errors" - "github.com/btcsuite/btcwallet/snacl" + "github.com/roasbeef/btcwallet/snacl" ) // TstMaxRecentHashes makes the unexported maxRecentHashes constant available diff --git a/wallet/chainntfns.go b/wallet/chainntfns.go index 9a0f1c8..c09a5d3 100644 --- a/wallet/chainntfns.go +++ b/wallet/chainntfns.go @@ -5,10 +5,10 @@ package wallet import ( - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcwallet/chain" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/wtxmgr" ) func (w *Wallet) handleChainNotifications() { diff --git a/wallet/internal/txsizes/size.go b/wallet/internal/txsizes/size.go index cbf602e..87a2435 100644 --- a/wallet/internal/txsizes/size.go +++ b/wallet/internal/txsizes/size.go @@ -5,9 +5,9 @@ package txsizes import ( - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/wire" - h "github.com/btcsuite/btcwallet/internal/helpers" + h "github.com/roasbeef/btcwallet/internal/helpers" ) // Worst case script and input/output size estimates. diff --git a/wallet/internal/txsizes/size_test.go b/wallet/internal/txsizes/size_test.go index 93620be..3891169 100644 --- a/wallet/internal/txsizes/size_test.go +++ b/wallet/internal/txsizes/size_test.go @@ -3,8 +3,8 @@ package txsizes_test import ( "testing" - "github.com/btcsuite/btcd/wire" - . "github.com/btcsuite/btcwallet/wallet/internal/txsizes" + "github.com/roasbeef/btcd/wire" + . "github.com/roasbeef/btcwallet/wallet/internal/txsizes" ) const ( diff --git a/wallet/loader.go b/wallet/loader.go index dc274c1..85015bf 100644 --- a/wallet/loader.go +++ b/wallet/loader.go @@ -10,10 +10,10 @@ import ( "path/filepath" "sync" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcwallet/internal/prompt" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcwallet/internal/prompt" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/walletdb" ) const ( diff --git a/wallet/rescan.go b/wallet/rescan.go index ce74c57..ab95629 100644 --- a/wallet/rescan.go +++ b/wallet/rescan.go @@ -5,11 +5,11 @@ package wallet import ( - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/chain" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/wtxmgr" ) // RescanProgressMsg reports the current progress made by a rescan for a diff --git a/wallet/txauthor/author.go b/wallet/txauthor/author.go index e77fd4e..43ba97a 100644 --- a/wallet/txauthor/author.go +++ b/wallet/txauthor/author.go @@ -8,14 +8,14 @@ package txauthor import ( "errors" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/wallet/txrules" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/wallet/txrules" - h "github.com/btcsuite/btcwallet/internal/helpers" - "github.com/btcsuite/btcwallet/wallet/internal/txsizes" + h "github.com/roasbeef/btcwallet/internal/helpers" + "github.com/roasbeef/btcwallet/wallet/internal/txsizes" ) // InputSource provides transaction inputs referencing spendable outputs to diff --git a/wallet/txauthor/author_test.go b/wallet/txauthor/author_test.go index fc02166..5873071 100644 --- a/wallet/txauthor/author_test.go +++ b/wallet/txauthor/author_test.go @@ -7,12 +7,12 @@ package txauthor_test import ( "testing" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - . "github.com/btcsuite/btcwallet/wallet/txauthor" - "github.com/btcsuite/btcwallet/wallet/txrules" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + . "github.com/roasbeef/btcwallet/wallet/txauthor" + "github.com/roasbeef/btcwallet/wallet/txrules" - "github.com/btcsuite/btcwallet/wallet/internal/txsizes" + "github.com/roasbeef/btcwallet/wallet/internal/txsizes" ) func p2pkhOutputs(amounts ...btcutil.Amount) []*wire.TxOut { diff --git a/wallet/txrules/rules.go b/wallet/txrules/rules.go index f7ebdd6..06f3f82 100644 --- a/wallet/txrules/rules.go +++ b/wallet/txrules/rules.go @@ -9,9 +9,9 @@ package txrules import ( "errors" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) // DefaultRelayFeePerKb is the default minimum relay fee policy for a mempool. diff --git a/wallet/wallet.go b/wallet/wallet.go index dc697bc..042c5b0 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -24,7 +24,6 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" "github.com/btcsuite/btcwallet/chain" diff --git a/walletdb/bdb/driver.go b/walletdb/bdb/driver.go index 2a99cec..2e5ecd9 100644 --- a/walletdb/bdb/driver.go +++ b/walletdb/bdb/driver.go @@ -7,7 +7,7 @@ package bdb import ( "fmt" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcwallet/walletdb" ) const ( diff --git a/walletdb/bdb/driver_test.go b/walletdb/bdb/driver_test.go index c617ca0..6ebcae6 100644 --- a/walletdb/bdb/driver_test.go +++ b/walletdb/bdb/driver_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcwallet/walletdb" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) // dbType is the database type name for this driver. diff --git a/walletdb/bdb/interface_test.go b/walletdb/bdb/interface_test.go index 0eeeb95..7c6f6c0 100644 --- a/walletdb/bdb/interface_test.go +++ b/walletdb/bdb/interface_test.go @@ -17,7 +17,7 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcwallet/walletdb" ) // subTestFailError is used to signal that a sub test returned false. diff --git a/walletdb/db_test.go b/walletdb/db_test.go index 95ce2de..143f8a7 100644 --- a/walletdb/db_test.go +++ b/walletdb/db_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcwallet/walletdb" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) var ( diff --git a/walletdb/example_test.go b/walletdb/example_test.go index 576bd63..2d7c0a5 100644 --- a/walletdb/example_test.go +++ b/walletdb/example_test.go @@ -10,8 +10,8 @@ import ( "os" "path/filepath" - "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcwallet/walletdb" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) // This example demonstrates creating a new database. @@ -19,8 +19,8 @@ func ExampleCreate() { // This example assumes the bdb (bolt db) driver is imported. // // import ( - // "github.com/btcsuite/btcwallet/walletdb" - // _ "github.com/btcsuite/btcwallet/walletdb/bdb" + // "github.com/roasbeef/btcwallet/walletdb" + // _ "github.com/roasbeef/btcwallet/walletdb/bdb" // ) // Create a database and schedule it to be closed and removed on exit. @@ -96,8 +96,8 @@ func Example_basicUsage() { // This example assumes the bdb (bolt db) driver is imported. // // import ( - // "github.com/btcsuite/btcwallet/walletdb" - // _ "github.com/btcsuite/btcwallet/walletdb/bdb" + // "github.com/roasbeef/btcwallet/walletdb" + // _ "github.com/roasbeef/btcwallet/walletdb/bdb" // ) // Create a database and schedule it to be closed and removed on exit. diff --git a/walletdb/interface_test.go b/walletdb/interface_test.go index aa9a7a5..44418fc 100644 --- a/walletdb/interface_test.go +++ b/walletdb/interface_test.go @@ -17,7 +17,7 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcwallet/walletdb" ) // subTestFailError is used to signal that a sub test returned false. diff --git a/walletsetup.go b/walletsetup.go index 5f16c92..56c9a58 100644 --- a/walletsetup.go +++ b/walletsetup.go @@ -10,16 +10,16 @@ import ( "os" "path/filepath" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/internal/legacy/keystore" - "github.com/btcsuite/btcwallet/internal/prompt" - "github.com/btcsuite/btcwallet/waddrmgr" - "github.com/btcsuite/btcwallet/wallet" - "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/internal/legacy/keystore" + "github.com/roasbeef/btcwallet/internal/prompt" + "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/wallet" + "github.com/roasbeef/btcwallet/walletdb" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) // networkDir returns the directory name of a network directory to hold wallet