From 84fa553b65755831c537a8fcb974167dbc2b6658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Senart?= Date: Wed, 2 Jul 2014 15:50:08 +0200 Subject: [PATCH] Split imports into logical groups --- addrmanager.go | 3 ++- addrmanager_test.go | 3 ++- blockmanager.go | 11 ++++++----- btcd.go | 3 ++- config.go | 15 ++++++++------- cpuminer.go | 7 ++++--- log.go | 5 +++-- mempool.go | 9 +++++---- mining.go | 3 ++- mruinvmap.go | 1 + mruinvmap_test.go | 3 ++- peer.go | 13 +++++++------ rpcserver.go | 21 +++++++++++---------- rpcwebsocket.go | 9 +++++---- server.go | 9 +++++---- service_windows.go | 7 ++++--- util/addblock/addblock.go | 7 ++++--- util/addblock/config.go | 7 ++++--- util/addblock/import.go | 7 ++++--- util/btcctl/btcctl.go | 11 ++++++----- util/btcctl/config.go | 5 +++-- util/dropafter/dropafter.go | 9 +++++---- util/findcheckpoint/config.go | 7 ++++--- util/findcheckpoint/findcheckpoint.go | 5 +++-- util/gencerts/gencerts.go | 5 +++-- util/showblock/showblock.go | 11 ++++++----- 26 files changed, 111 insertions(+), 85 deletions(-) diff --git a/addrmanager.go b/addrmanager.go index 55e4d6f4..1c28c5ea 100644 --- a/addrmanager.go +++ b/addrmanager.go @@ -11,7 +11,6 @@ import ( "encoding/binary" "encoding/json" "fmt" - "github.com/conformal/btcwire" "io" "math" "math/rand" @@ -23,6 +22,8 @@ import ( "sync" "sync/atomic" "time" + + "github.com/conformal/btcwire" ) const ( diff --git a/addrmanager_test.go b/addrmanager_test.go index a0352540..beda3587 100644 --- a/addrmanager_test.go +++ b/addrmanager_test.go @@ -5,10 +5,11 @@ package main import ( - "github.com/conformal/btcwire" "net" "testing" "time" + + "github.com/conformal/btcwire" ) // naTest is used to describe a test to be perfomed against the NetAddressKey diff --git a/blockmanager.go b/blockmanager.go index 36dd099e..9dfeed02 100644 --- a/blockmanager.go +++ b/blockmanager.go @@ -6,17 +6,18 @@ package main import ( "container/list" - "github.com/conformal/btcchain" - "github.com/conformal/btcdb" - "github.com/conformal/btcnet" - "github.com/conformal/btcutil" - "github.com/conformal/btcwire" "net" "os" "path/filepath" "sync" "sync/atomic" "time" + + "github.com/conformal/btcchain" + "github.com/conformal/btcdb" + "github.com/conformal/btcnet" + "github.com/conformal/btcutil" + "github.com/conformal/btcwire" ) const ( diff --git a/btcd.go b/btcd.go index b41c9bfb..5ef0dd05 100644 --- a/btcd.go +++ b/btcd.go @@ -6,13 +6,14 @@ package main import ( "fmt" - "github.com/conformal/btcd/limits" "net" "net/http" _ "net/http/pprof" "os" "runtime" "runtime/pprof" + + "github.com/conformal/btcd/limits" ) var ( diff --git a/config.go b/config.go index 91cb5383..e3630aba 100644 --- a/config.go +++ b/config.go @@ -7,13 +7,6 @@ package main import ( "errors" "fmt" - "github.com/conformal/btcdb" - _ "github.com/conformal/btcdb/ldb" - _ "github.com/conformal/btcdb/memdb" - "github.com/conformal/btcutil" - "github.com/conformal/btcwire" - "github.com/conformal/go-flags" - "github.com/conformal/go-socks" "net" "os" "path/filepath" @@ -22,6 +15,14 @@ import ( "strconv" "strings" "time" + + "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" ) const ( diff --git a/cpuminer.go b/cpuminer.go index f046a520..b8667b38 100644 --- a/cpuminer.go +++ b/cpuminer.go @@ -6,13 +6,14 @@ package main import ( "fmt" - "github.com/conformal/btcchain" - "github.com/conformal/btcutil" - "github.com/conformal/btcwire" "math/rand" "runtime" "sync" "time" + + "github.com/conformal/btcchain" + "github.com/conformal/btcutil" + "github.com/conformal/btcwire" ) const ( diff --git a/log.go b/log.go index 8cdcaa2e..b92ad78e 100644 --- a/log.go +++ b/log.go @@ -6,14 +6,15 @@ package main import ( "fmt" + "os" + "time" + "github.com/conformal/btcchain" "github.com/conformal/btcdb" "github.com/conformal/btclog" "github.com/conformal/btcscript" "github.com/conformal/btcwire" "github.com/conformal/seelog" - "os" - "time" ) const ( diff --git a/mempool.go b/mempool.go index 93ee8042..c7e6e9cb 100644 --- a/mempool.go +++ b/mempool.go @@ -8,15 +8,16 @@ import ( "container/list" "crypto/rand" "fmt" + "math" + "math/big" + "sync" + "time" + "github.com/conformal/btcchain" "github.com/conformal/btcdb" "github.com/conformal/btcscript" "github.com/conformal/btcutil" "github.com/conformal/btcwire" - "math" - "math/big" - "sync" - "time" ) // TxRuleError identifies a rule violation. It is used to indicate that diff --git a/mining.go b/mining.go index 644706a5..b87613e9 100644 --- a/mining.go +++ b/mining.go @@ -8,12 +8,13 @@ import ( "container/heap" "container/list" "fmt" + "time" + "github.com/conformal/btcchain" "github.com/conformal/btcdb" "github.com/conformal/btcscript" "github.com/conformal/btcutil" "github.com/conformal/btcwire" - "time" ) const ( diff --git a/mruinvmap.go b/mruinvmap.go index e6787de1..0f8db466 100644 --- a/mruinvmap.go +++ b/mruinvmap.go @@ -7,6 +7,7 @@ package main import ( "container/list" "fmt" + "github.com/conformal/btcwire" ) diff --git a/mruinvmap_test.go b/mruinvmap_test.go index 1304bfc9..f5cd0b69 100644 --- a/mruinvmap_test.go +++ b/mruinvmap_test.go @@ -6,8 +6,9 @@ package main import ( "crypto/rand" - "github.com/conformal/btcwire" "testing" + + "github.com/conformal/btcwire" ) // BenchmarkMruInventoryList performs basic benchmarks on the most recently diff --git a/peer.go b/peer.go index fe1717ff..5701901e 100644 --- a/peer.go +++ b/peer.go @@ -8,17 +8,18 @@ import ( "bytes" "container/list" "fmt" - "github.com/conformal/btcchain" - "github.com/conformal/btcdb" - "github.com/conformal/btcutil" - "github.com/conformal/btcwire" - "github.com/conformal/go-socks" - "github.com/davecgh/go-spew/spew" "net" "strconv" "sync" "sync/atomic" "time" + + "github.com/conformal/btcchain" + "github.com/conformal/btcdb" + "github.com/conformal/btcutil" + "github.com/conformal/btcwire" + socks "github.com/conformal/go-socks" + "github.com/davecgh/go-spew/spew" ) const ( diff --git a/rpcserver.go b/rpcserver.go index df67c792..dd82ad96 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -13,16 +13,6 @@ import ( "encoding/hex" "errors" "fmt" - "github.com/conformal/btcchain" - "github.com/conformal/btcdb" - "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" - "github.com/conformal/websocket" "io" "io/ioutil" "math/big" @@ -34,6 +24,17 @@ import ( "sync" "sync/atomic" "time" + + "github.com/conformal/btcchain" + "github.com/conformal/btcdb" + "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" + "github.com/conformal/websocket" ) const ( diff --git a/rpcwebsocket.go b/rpcwebsocket.go index 2e6485fc..a8a34269 100644 --- a/rpcwebsocket.go +++ b/rpcwebsocket.go @@ -6,7 +6,6 @@ package main import ( "bytes" - "code.google.com/p/go.crypto/ripemd160" "container/list" "crypto/subtle" "encoding/base64" @@ -14,6 +13,11 @@ import ( "encoding/json" "errors" "fmt" + "io" + "sync" + "time" + + "code.google.com/p/go.crypto/ripemd160" "github.com/conformal/btcjson" "github.com/conformal/btcscript" "github.com/conformal/btcutil" @@ -21,9 +25,6 @@ import ( "github.com/conformal/btcws" "github.com/conformal/fastsha256" "github.com/conformal/websocket" - "io" - "sync" - "time" ) const ( diff --git a/server.go b/server.go index 7fb90a42..5285bad3 100644 --- a/server.go +++ b/server.go @@ -10,10 +10,6 @@ import ( "encoding/binary" "errors" "fmt" - "github.com/conformal/btcdb" - "github.com/conformal/btcjson" - "github.com/conformal/btcnet" - "github.com/conformal/btcwire" "math" "net" "runtime" @@ -21,6 +17,11 @@ import ( "sync" "sync/atomic" "time" + + "github.com/conformal/btcdb" + "github.com/conformal/btcjson" + "github.com/conformal/btcnet" + "github.com/conformal/btcwire" ) const ( diff --git a/service_windows.go b/service_windows.go index 44dd4273..81cd4e3e 100644 --- a/service_windows.go +++ b/service_windows.go @@ -6,12 +6,13 @@ package main import ( "fmt" - "github.com/conformal/winsvc/eventlog" - "github.com/conformal/winsvc/mgr" - "github.com/conformal/winsvc/svc" "os" "path/filepath" "time" + + "github.com/conformal/winsvc/eventlog" + "github.com/conformal/winsvc/mgr" + "github.com/conformal/winsvc/svc" ) const ( diff --git a/util/addblock/addblock.go b/util/addblock/addblock.go index ccab7d43..6dc8acf4 100644 --- a/util/addblock/addblock.go +++ b/util/addblock/addblock.go @@ -5,14 +5,15 @@ package main import ( + "os" + "path/filepath" + "runtime" + "github.com/conformal/btcchain" "github.com/conformal/btcd/limits" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btclog" - "os" - "path/filepath" - "runtime" ) const ( diff --git a/util/addblock/config.go b/util/addblock/config.go index 6e32a43d..638fac3c 100644 --- a/util/addblock/config.go +++ b/util/addblock/config.go @@ -6,14 +6,15 @@ package main import ( "fmt" + "os" + "path/filepath" + "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btcnet" "github.com/conformal/btcutil" "github.com/conformal/btcwire" - "github.com/conformal/go-flags" - "os" - "path/filepath" + flags "github.com/conformal/go-flags" ) const ( diff --git a/util/addblock/import.go b/util/addblock/import.go index e4df208d..69a2017e 100644 --- a/util/addblock/import.go +++ b/util/addblock/import.go @@ -7,14 +7,15 @@ package main import ( "encoding/binary" "fmt" + "io" + "sync" + "time" + "github.com/conformal/btcchain" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btcutil" "github.com/conformal/btcwire" - "io" - "sync" - "time" ) var zeroHash = btcwire.ShaHash{} diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go index 0ebcfd3d..436ccdc0 100644 --- a/util/btcctl/btcctl.go +++ b/util/btcctl/btcctl.go @@ -5,15 +5,16 @@ import ( "encoding/json" "errors" "fmt" - "github.com/conformal/btcjson" - "github.com/conformal/btcutil" - "github.com/conformal/btcws" - "github.com/conformal/go-flags" - "github.com/davecgh/go-spew/spew" "io/ioutil" "os" "sort" "strconv" + + "github.com/conformal/btcjson" + "github.com/conformal/btcutil" + "github.com/conformal/btcws" + flags "github.com/conformal/go-flags" + "github.com/davecgh/go-spew/spew" ) // conversionHandler is a handler that is used to convert parameters from the diff --git a/util/btcctl/config.go b/util/btcctl/config.go index 5d13c57c..847d83e1 100644 --- a/util/btcctl/config.go +++ b/util/btcctl/config.go @@ -2,12 +2,13 @@ package main import ( "fmt" - "github.com/conformal/btcutil" - "github.com/conformal/go-flags" "net" "os" "path/filepath" "strings" + + "github.com/conformal/btcutil" + flags "github.com/conformal/go-flags" ) var ( diff --git a/util/dropafter/dropafter.go b/util/dropafter/dropafter.go index 00bb15d2..3e51cb4a 100644 --- a/util/dropafter/dropafter.go +++ b/util/dropafter/dropafter.go @@ -7,15 +7,16 @@ package main import ( "errors" "fmt" + "os" + "path/filepath" + "strconv" + "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btclog" "github.com/conformal/btcutil" "github.com/conformal/btcwire" - "github.com/conformal/go-flags" - "os" - "path/filepath" - "strconv" + flags "github.com/conformal/go-flags" ) type ShaHash btcwire.ShaHash diff --git a/util/findcheckpoint/config.go b/util/findcheckpoint/config.go index f025c502..830c1407 100644 --- a/util/findcheckpoint/config.go +++ b/util/findcheckpoint/config.go @@ -6,14 +6,15 @@ package main import ( "fmt" + "os" + "path/filepath" + "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btcnet" "github.com/conformal/btcutil" "github.com/conformal/btcwire" - "github.com/conformal/go-flags" - "os" - "path/filepath" + flags "github.com/conformal/go-flags" ) const ( diff --git a/util/findcheckpoint/findcheckpoint.go b/util/findcheckpoint/findcheckpoint.go index 1812583a..bcaed920 100644 --- a/util/findcheckpoint/findcheckpoint.go +++ b/util/findcheckpoint/findcheckpoint.go @@ -6,13 +6,14 @@ package main import ( "fmt" + "os" + "path/filepath" + "github.com/conformal/btcchain" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btcnet" "github.com/conformal/btcwire" - "os" - "path/filepath" ) const blockDbNamePrefix = "blocks" diff --git a/util/gencerts/gencerts.go b/util/gencerts/gencerts.go index 87841452..7899a672 100644 --- a/util/gencerts/gencerts.go +++ b/util/gencerts/gencerts.go @@ -6,13 +6,14 @@ package main import ( "fmt" - "github.com/conformal/btcutil" - "github.com/conformal/go-flags" "io/ioutil" "os" "path/filepath" "strings" "time" + + "github.com/conformal/btcutil" + flags "github.com/conformal/go-flags" ) type config struct { diff --git a/util/showblock/showblock.go b/util/showblock/showblock.go index 80d5b4a3..e747009a 100644 --- a/util/showblock/showblock.go +++ b/util/showblock/showblock.go @@ -7,17 +7,18 @@ package main import ( "encoding/binary" "errors" + "io" + "os" + "path/filepath" + "strconv" + "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btclog" "github.com/conformal/btcutil" "github.com/conformal/btcwire" - "github.com/conformal/go-flags" + flags "github.com/conformal/go-flags" "github.com/davecgh/go-spew/spew" - "io" - "os" - "path/filepath" - "strconv" ) type ShaHash btcwire.ShaHash