From a26a65e2e05e2df32260f422af6706f9d87822a9 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 16 Jan 2015 17:32:30 -0600 Subject: [PATCH] Update btcnet import paths to new location. --- chain/chain.go | 2 +- keystore/keystore.go | 2 +- keystore/keystore_test.go | 2 +- params.go | 2 +- txstore/json.go | 2 +- txstore/tx.go | 2 +- txstore/tx_test.go | 2 +- votingpool/example_test.go | 2 +- votingpool/pool_test.go | 2 +- waddrmgr/common_test.go | 2 +- waddrmgr/manager.go | 2 +- waddrmgr/manager_test.go | 2 +- wallet.go | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/chain/chain.go b/chain/chain.go index 75482ff..a37ac1d 100644 --- a/chain/chain.go +++ b/chain/chain.go @@ -21,10 +21,10 @@ import ( "sync" "time" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwire" - "github.com/conformal/btcnet" "github.com/conformal/btcwallet/keystore" "github.com/conformal/btcwallet/txstore" "github.com/conformal/btcws" diff --git a/keystore/keystore.go b/keystore/keystore.go index c08ad3d..dafc62e 100644 --- a/keystore/keystore.go +++ b/keystore/keystore.go @@ -36,10 +36,10 @@ import ( "golang.org/x/crypto/ripemd160" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwire" "github.com/conformal/btcec" - "github.com/conformal/btcnet" "github.com/conformal/btcscript" "github.com/conformal/btcwallet/rename" ) diff --git a/keystore/keystore_test.go b/keystore/keystore_test.go index b2ffd90..e1cebac 100644 --- a/keystore/keystore_test.go +++ b/keystore/keystore_test.go @@ -23,10 +23,10 @@ import ( "reflect" "testing" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwire" "github.com/conformal/btcec" - "github.com/conformal/btcnet" "github.com/conformal/btcscript" "github.com/davecgh/go-spew/spew" diff --git a/params.go b/params.go index 6a3c3aa..550b1c6 100644 --- a/params.go +++ b/params.go @@ -17,7 +17,7 @@ package main import ( - "github.com/conformal/btcnet" + "github.com/btcsuite/btcnet" ) var activeNet = &testNet3Params diff --git a/txstore/json.go b/txstore/json.go index b6d151c..5273482 100644 --- a/txstore/json.go +++ b/txstore/json.go @@ -17,10 +17,10 @@ package txstore import ( + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/conformal/btcchain" "github.com/conformal/btcjson" - "github.com/conformal/btcnet" "github.com/conformal/btcscript" ) diff --git a/txstore/tx.go b/txstore/tx.go index 67f18ec..f3bea22 100644 --- a/txstore/tx.go +++ b/txstore/tx.go @@ -24,10 +24,10 @@ import ( "sync" "time" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwire" "github.com/conformal/btcchain" - "github.com/conformal/btcnet" "github.com/conformal/btcscript" ) diff --git a/txstore/tx_test.go b/txstore/tx_test.go index c805551..07b43f3 100644 --- a/txstore/tx_test.go +++ b/txstore/tx_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwire" - "github.com/conformal/btcnet" . "github.com/conformal/btcwallet/txstore" ) diff --git a/votingpool/example_test.go b/votingpool/example_test.go index c9f9fe8..b568bbe 100644 --- a/votingpool/example_test.go +++ b/votingpool/example_test.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/conformal/btcnet" + "github.com/btcsuite/btcnet" "github.com/conformal/btcwallet/votingpool" "github.com/conformal/btcwallet/waddrmgr" "github.com/conformal/btcwallet/walletdb" diff --git a/votingpool/pool_test.go b/votingpool/pool_test.go index 3e791a6..6d62d19 100644 --- a/votingpool/pool_test.go +++ b/votingpool/pool_test.go @@ -27,8 +27,8 @@ import ( "runtime" "testing" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil/hdkeychain" - "github.com/conformal/btcnet" "github.com/conformal/btcwallet/votingpool" "github.com/conformal/btcwallet/waddrmgr" "github.com/conformal/btcwallet/walletdb" diff --git a/waddrmgr/common_test.go b/waddrmgr/common_test.go index 59ef2e8..5362928 100644 --- a/waddrmgr/common_test.go +++ b/waddrmgr/common_test.go @@ -23,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/conformal/btcnet" + "github.com/btcsuite/btcnet" "github.com/conformal/btcwallet/waddrmgr" "github.com/conformal/btcwallet/walletdb" _ "github.com/conformal/btcwallet/walletdb/bdb" diff --git a/waddrmgr/manager.go b/waddrmgr/manager.go index ada9ca1..6675b9d 100644 --- a/waddrmgr/manager.go +++ b/waddrmgr/manager.go @@ -20,11 +20,11 @@ import ( "fmt" "sync" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/hdkeychain" "github.com/btcsuite/btcwire" "github.com/conformal/btcec" - "github.com/conformal/btcnet" "github.com/conformal/btcwallet/snacl" "github.com/conformal/btcwallet/walletdb" ) diff --git a/waddrmgr/manager_test.go b/waddrmgr/manager_test.go index 9d5e167..0283641 100644 --- a/waddrmgr/manager_test.go +++ b/waddrmgr/manager_test.go @@ -23,9 +23,9 @@ import ( "reflect" "testing" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwire" - "github.com/conformal/btcnet" "github.com/conformal/btcwallet/waddrmgr" "github.com/conformal/btcwallet/walletdb" ) diff --git a/wallet.go b/wallet.go index 4e0ab09..9edeb02 100644 --- a/wallet.go +++ b/wallet.go @@ -26,11 +26,11 @@ import ( "sync" "time" + "github.com/btcsuite/btcnet" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwire" "github.com/conformal/btcchain" "github.com/conformal/btcjson" - "github.com/conformal/btcnet" "github.com/conformal/btcwallet/chain" "github.com/conformal/btcwallet/keystore" "github.com/conformal/btcwallet/txstore"