diff --git a/chain/bitcoind.go b/chain/bitcoind.go index 9f2d64f..53d0b8b 100644 --- a/chain/bitcoind.go +++ b/chain/bitcoind.go @@ -10,7 +10,6 @@ import ( "sync/atomic" "time" - "github.com/lightninglabs/gozmq" "github.com/btcsuite/btcd/btcjson" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg/chainhash" @@ -20,6 +19,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/lightninglabs/gozmq" ) // BitcoindClient represents a persistent client connection to a bitcoind server diff --git a/chain/neutrino.go b/chain/neutrino.go index e7b2f77..4684464 100644 --- a/chain/neutrino.go +++ b/chain/neutrino.go @@ -6,7 +6,6 @@ import ( "sync" "time" - "github.com/lightninglabs/neutrino" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/rpcclient" @@ -17,6 +16,7 @@ import ( "github.com/btcsuite/btcutil/gcs/builder" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/lightninglabs/neutrino" ) // NeutrinoClient is an implementation of the btcwalet chain.Interface interface. diff --git a/cmd/dropwtxmgr/main.go b/cmd/dropwtxmgr/main.go index 464fdd2..2691fb8 100644 --- a/cmd/dropwtxmgr/main.go +++ b/cmd/dropwtxmgr/main.go @@ -11,11 +11,11 @@ import ( "os" "path/filepath" - "github.com/jessevdk/go-flags" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/walletdb" _ "github.com/btcsuite/btcwallet/walletdb/bdb" "github.com/btcsuite/btcwallet/wtxmgr" + "github.com/jessevdk/go-flags" ) const defaultNet = "mainnet" diff --git a/config.go b/config.go index e9c0a42..2b9e7ea 100644 --- a/config.go +++ b/config.go @@ -15,13 +15,13 @@ import ( "strings" "time" - flags "github.com/jessevdk/go-flags" - "github.com/lightninglabs/neutrino" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/internal/cfgutil" "github.com/btcsuite/btcwallet/internal/legacy/keystore" "github.com/btcsuite/btcwallet/netparams" "github.com/btcsuite/btcwallet/wallet" + flags "github.com/jessevdk/go-flags" + "github.com/lightninglabs/neutrino" ) const ( diff --git a/walletdb/bdb/db.go b/walletdb/bdb/db.go index dcf2317..8685adc 100644 --- a/walletdb/bdb/db.go +++ b/walletdb/bdb/db.go @@ -8,8 +8,8 @@ import ( "io" "os" - "github.com/coreos/bbolt" "github.com/btcsuite/btcwallet/walletdb" + "github.com/coreos/bbolt" ) // convertErr converts some bolt errors to the equivalent walletdb error.