From 58db4a8b7e026d92a7f83476ac96fca01c168eb4 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Thu, 15 Jan 2015 10:30:38 -0600 Subject: [PATCH] Update btcutil import paths to new location. --- blockmanager.go | 2 +- config.go | 2 +- cpuminer.go | 2 +- mempool.go | 2 +- mining.go | 2 +- peer.go | 4 ++-- rpcserver.go | 2 +- rpcwebsocket.go | 2 +- util/addblock/config.go | 2 +- util/addblock/import.go | 2 +- util/btcctl/btcctl.go | 2 +- util/btcctl/config.go | 2 +- util/dropafter/dropafter.go | 2 +- util/findcheckpoint/config.go | 2 +- util/gencerts/gencerts.go | 2 +- util/showblock/showblock.go | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/blockmanager.go b/blockmanager.go index 29b64250..027c2b39 100644 --- a/blockmanager.go +++ b/blockmanager.go @@ -13,10 +13,10 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcutil" "github.com/conformal/btcchain" "github.com/conformal/btcdb" "github.com/conformal/btcnet" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" ) diff --git a/config.go b/config.go index 5cf52c7a..a2a5a935 100644 --- a/config.go +++ b/config.go @@ -16,10 +16,10 @@ import ( "strings" "time" + "github.com/btcsuite/btcutil" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" _ "github.com/conformal/btcdb/memdb" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" flags "github.com/conformal/go-flags" socks "github.com/conformal/go-socks" diff --git a/cpuminer.go b/cpuminer.go index 618e5489..08cfd0ac 100644 --- a/cpuminer.go +++ b/cpuminer.go @@ -11,8 +11,8 @@ import ( "sync" "time" + "github.com/btcsuite/btcutil" "github.com/conformal/btcchain" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" ) diff --git a/mempool.go b/mempool.go index 4baf31da..b3bef7c7 100644 --- a/mempool.go +++ b/mempool.go @@ -13,10 +13,10 @@ import ( "sync" "time" + "github.com/btcsuite/btcutil" "github.com/conformal/btcchain" "github.com/conformal/btcdb" "github.com/conformal/btcscript" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" ) diff --git a/mining.go b/mining.go index c1f4a262..76589746 100644 --- a/mining.go +++ b/mining.go @@ -10,10 +10,10 @@ import ( "fmt" "time" + "github.com/btcsuite/btcutil" "github.com/conformal/btcchain" "github.com/conformal/btcdb" "github.com/conformal/btcscript" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" ) diff --git a/peer.go b/peer.go index ded181ac..b384d886 100644 --- a/peer.go +++ b/peer.go @@ -16,11 +16,11 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/bloom" "github.com/conformal/btcchain" "github.com/conformal/btcd/addrmgr" "github.com/conformal/btcdb" - "github.com/conformal/btcutil" - "github.com/conformal/btcutil/bloom" "github.com/conformal/btcwire" socks "github.com/conformal/go-socks" "github.com/davecgh/go-spew/spew" diff --git a/rpcserver.go b/rpcserver.go index 27d3ce69..597f52ee 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcutil" "github.com/conformal/btcchain" "github.com/conformal/btcdb" "github.com/conformal/btcec" "github.com/conformal/btcjson" "github.com/conformal/btcnet" "github.com/conformal/btcscript" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" "github.com/conformal/btcws" "github.com/conformal/fastsha256" diff --git a/rpcwebsocket.go b/rpcwebsocket.go index fa478034..5fe0da5f 100644 --- a/rpcwebsocket.go +++ b/rpcwebsocket.go @@ -19,10 +19,10 @@ import ( "golang.org/x/crypto/ripemd160" + "github.com/btcsuite/btcutil" "github.com/conformal/btcdb" "github.com/conformal/btcjson" "github.com/conformal/btcscript" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" "github.com/conformal/btcws" "github.com/conformal/fastsha256" diff --git a/util/addblock/config.go b/util/addblock/config.go index 5e3d118b..edebb7af 100644 --- a/util/addblock/config.go +++ b/util/addblock/config.go @@ -9,10 +9,10 @@ import ( "os" "path/filepath" + "github.com/btcsuite/btcutil" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btcnet" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" flags "github.com/conformal/go-flags" ) diff --git a/util/addblock/import.go b/util/addblock/import.go index c104a2d1..b658f3f4 100644 --- a/util/addblock/import.go +++ b/util/addblock/import.go @@ -11,10 +11,10 @@ import ( "sync" "time" + "github.com/btcsuite/btcutil" "github.com/conformal/btcchain" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" ) diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go index 730bb202..f7112edb 100644 --- a/util/btcctl/btcctl.go +++ b/util/btcctl/btcctl.go @@ -10,8 +10,8 @@ import ( "sort" "strconv" + "github.com/btcsuite/btcutil" "github.com/conformal/btcjson" - "github.com/conformal/btcutil" "github.com/conformal/btcws" flags "github.com/conformal/go-flags" "github.com/davecgh/go-spew/spew" diff --git a/util/btcctl/config.go b/util/btcctl/config.go index 27e670fc..3504ab5b 100644 --- a/util/btcctl/config.go +++ b/util/btcctl/config.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/conformal/btcutil" + "github.com/btcsuite/btcutil" flags "github.com/conformal/go-flags" ) diff --git a/util/dropafter/dropafter.go b/util/dropafter/dropafter.go index 34f7e58f..179a0959 100644 --- a/util/dropafter/dropafter.go +++ b/util/dropafter/dropafter.go @@ -11,11 +11,11 @@ import ( "path/filepath" "strconv" + "github.com/btcsuite/btcutil" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btclog" "github.com/conformal/btcnet" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" flags "github.com/conformal/go-flags" ) diff --git a/util/findcheckpoint/config.go b/util/findcheckpoint/config.go index 1fa28267..9d052090 100644 --- a/util/findcheckpoint/config.go +++ b/util/findcheckpoint/config.go @@ -9,10 +9,10 @@ import ( "os" "path/filepath" + "github.com/btcsuite/btcutil" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btcnet" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" flags "github.com/conformal/go-flags" ) diff --git a/util/gencerts/gencerts.go b/util/gencerts/gencerts.go index 7899a672..ed03b749 100644 --- a/util/gencerts/gencerts.go +++ b/util/gencerts/gencerts.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/conformal/btcutil" + "github.com/btcsuite/btcutil" flags "github.com/conformal/go-flags" ) diff --git a/util/showblock/showblock.go b/util/showblock/showblock.go index ce45bcc2..955719bd 100644 --- a/util/showblock/showblock.go +++ b/util/showblock/showblock.go @@ -13,11 +13,11 @@ import ( "path/filepath" "strconv" + "github.com/btcsuite/btcutil" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btclog" "github.com/conformal/btcnet" - "github.com/conformal/btcutil" "github.com/conformal/btcwire" flags "github.com/conformal/go-flags" "github.com/davecgh/go-spew/spew"