diff --git a/blockchain/accept.go b/blockchain/accept.go index d6153ebb..6acba30d 100644 --- a/blockchain/accept.go +++ b/blockchain/accept.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/lbryio/lbcd/database" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // maybeAcceptBlock potentially accepts a block into the block chain and, if diff --git a/blockchain/chain.go b/blockchain/chain.go index a6a9d90f..a0bfac6c 100644 --- a/blockchain/chain.go +++ b/blockchain/chain.go @@ -16,7 +16,7 @@ import ( "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" "github.com/lbryio/lbcd/claimtrie" ) diff --git a/blockchain/chainio.go b/blockchain/chainio.go index ab2d302f..ae83dc64 100644 --- a/blockchain/chainio.go +++ b/blockchain/chainio.go @@ -15,7 +15,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/blockchain/checkpoints.go b/blockchain/checkpoints.go index 7eb808e6..a82d70dd 100644 --- a/blockchain/checkpoints.go +++ b/blockchain/checkpoints.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/txscript" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // CheckpointConfirmations is the number of blocks before the end of the current diff --git a/blockchain/claimtrie.go b/blockchain/claimtrie.go index 2cfbefa8..74cf522d 100644 --- a/blockchain/claimtrie.go +++ b/blockchain/claimtrie.go @@ -8,7 +8,7 @@ import ( "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" "github.com/lbryio/lbcd/claimtrie" "github.com/lbryio/lbcd/claimtrie/change" diff --git a/blockchain/common_test.go b/blockchain/common_test.go index 585dd394..16ad6756 100644 --- a/blockchain/common_test.go +++ b/blockchain/common_test.go @@ -20,7 +20,7 @@ import ( _ "github.com/lbryio/lbcd/database/ffldb" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/blockchain/fullblocktests/generate.go b/blockchain/fullblocktests/generate.go index 621601d2..dc182a90 100644 --- a/blockchain/fullblocktests/generate.go +++ b/blockchain/fullblocktests/generate.go @@ -24,7 +24,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/blockchain/indexers/addrindex.go b/blockchain/indexers/addrindex.go index 4acfe905..3ac3924a 100644 --- a/blockchain/indexers/addrindex.go +++ b/blockchain/indexers/addrindex.go @@ -15,7 +15,7 @@ import ( "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/blockchain/indexers/blocklogger.go b/blockchain/indexers/blocklogger.go index 88d6f269..845618e7 100644 --- a/blockchain/indexers/blocklogger.go +++ b/blockchain/indexers/blocklogger.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btclog" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // blockProgressLogger provides periodic logging for other services in order diff --git a/blockchain/indexers/cfindex.go b/blockchain/indexers/cfindex.go index f10bc26f..881d3a30 100644 --- a/blockchain/indexers/cfindex.go +++ b/blockchain/indexers/cfindex.go @@ -12,9 +12,9 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/gcs" - "github.com/btcsuite/btcutil/gcs/builder" + btcutil "github.com/lbryio/lbcutil" + "github.com/lbryio/lbcutil/gcs" + "github.com/lbryio/lbcutil/gcs/builder" ) const ( diff --git a/blockchain/indexers/common.go b/blockchain/indexers/common.go index d956be60..57971d8b 100644 --- a/blockchain/indexers/common.go +++ b/blockchain/indexers/common.go @@ -13,7 +13,7 @@ import ( "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/database" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) var ( diff --git a/blockchain/indexers/manager.go b/blockchain/indexers/manager.go index cc4deb1e..7c0bb0e1 100644 --- a/blockchain/indexers/manager.go +++ b/blockchain/indexers/manager.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) var ( diff --git a/blockchain/indexers/txindex.go b/blockchain/indexers/txindex.go index 1ff3e369..96b3edcb 100644 --- a/blockchain/indexers/txindex.go +++ b/blockchain/indexers/txindex.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/blockchain/merkle.go b/blockchain/merkle.go index 0c98495d..92b59c5e 100644 --- a/blockchain/merkle.go +++ b/blockchain/merkle.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/txscript" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/blockchain/process.go b/blockchain/process.go index 3998b32e..a48b6e50 100644 --- a/blockchain/process.go +++ b/blockchain/process.go @@ -10,7 +10,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // BehaviorFlags is a bitmask defining tweaks to the normal behavior when diff --git a/blockchain/scriptval.go b/blockchain/scriptval.go index 4209753e..97bf0ece 100644 --- a/blockchain/scriptval.go +++ b/blockchain/scriptval.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // txValidateItem holds a transaction along with which input to validate. diff --git a/blockchain/utxoviewpoint.go b/blockchain/utxoviewpoint.go index b35604c6..60d48df0 100644 --- a/blockchain/utxoviewpoint.go +++ b/blockchain/utxoviewpoint.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // txoFlags is a bitmask defining additional information and state for a diff --git a/blockchain/validate.go b/blockchain/validate.go index 4fbeb868..85946611 100644 --- a/blockchain/validate.go +++ b/blockchain/validate.go @@ -15,7 +15,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/blockchain/weight.go b/blockchain/weight.go index d601be85..7dc51b3f 100644 --- a/blockchain/weight.go +++ b/blockchain/weight.go @@ -9,7 +9,7 @@ import ( "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/btcjson/chainsvrresults.go b/btcjson/chainsvrresults.go index 7c15ad4e..ecc26827 100644 --- a/btcjson/chainsvrresults.go +++ b/btcjson/chainsvrresults.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // GetBlockHeaderVerboseResult models the data from the getblockheader command when diff --git a/btcjson/chainsvrresults_test.go b/btcjson/chainsvrresults_test.go index 7018786e..cbdca095 100644 --- a/btcjson/chainsvrresults_test.go +++ b/btcjson/chainsvrresults_test.go @@ -9,10 +9,10 @@ import ( "reflect" "testing" + "github.com/davecgh/go-spew/spew" "github.com/lbryio/lbcd/btcjson" "github.com/lbryio/lbcd/chaincfg/chainhash" - "github.com/btcsuite/btcutil" - "github.com/davecgh/go-spew/spew" + btcutil "github.com/lbryio/lbcutil" ) // TestChainSvrCustomResults ensures any results that have custom marshalling diff --git a/btcjson/walletsvrcmds.go b/btcjson/walletsvrcmds.go index e8ed6237..e4d676ff 100644 --- a/btcjson/walletsvrcmds.go +++ b/btcjson/walletsvrcmds.go @@ -12,7 +12,7 @@ import ( "encoding/json" "fmt" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // AddMultisigAddressCmd defines the addmutisigaddress JSON-RPC command. diff --git a/btcjson/walletsvrcmds_test.go b/btcjson/walletsvrcmds_test.go index 67570c3b..d33888d4 100644 --- a/btcjson/walletsvrcmds_test.go +++ b/btcjson/walletsvrcmds_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/lbryio/lbcd/btcjson" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // TestWalletSvrCmds tests all of the wallet server commands marshal and diff --git a/btcjson/walletsvrresults_test.go b/btcjson/walletsvrresults_test.go index d7401c1d..510c367c 100644 --- a/btcjson/walletsvrresults_test.go +++ b/btcjson/walletsvrresults_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "github.com/lbryio/lbcd/txscript" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/txscript" ) // TestGetAddressInfoResult ensures that custom unmarshalling of diff --git a/chaincfg/doc.go b/chaincfg/doc.go index 4d33ffab..fb5fa677 100644 --- a/chaincfg/doc.go +++ b/chaincfg/doc.go @@ -25,7 +25,7 @@ // "fmt" // "log" // -// "github.com/btcsuite/btcutil" +// btcutil "github.com/lbryio/lbcutil" // "github.com/lbryio/lbcd/chaincfg" // ) // diff --git a/claimtrie/block/blockrepo/pebble.go b/claimtrie/block/blockrepo/pebble.go index 44d4ce94..6b57d767 100644 --- a/claimtrie/block/blockrepo/pebble.go +++ b/claimtrie/block/blockrepo/pebble.go @@ -2,6 +2,7 @@ package blockrepo import ( "encoding/binary" + "github.com/pkg/errors" "github.com/lbryio/lbcd/chaincfg/chainhash" diff --git a/claimtrie/change/claimid.go b/claimtrie/change/claimid.go index ef123fe5..e7a92565 100644 --- a/claimtrie/change/claimid.go +++ b/claimtrie/change/claimid.go @@ -3,9 +3,10 @@ package change import ( "encoding/binary" "encoding/hex" + "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // ClaimID represents a Claim's ClaimID. diff --git a/claimtrie/cmd/cmd/chain.go b/claimtrie/cmd/cmd/chain.go index 1c699323..45e843b5 100644 --- a/claimtrie/cmd/cmd/chain.go +++ b/claimtrie/cmd/cmd/chain.go @@ -16,7 +16,7 @@ import ( _ "github.com/lbryio/lbcd/database/ffldb" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble" diff --git a/claimtrie/cmd/cmd/node.go b/claimtrie/cmd/cmd/node.go index 489fc846..08112e94 100644 --- a/claimtrie/cmd/cmd/node.go +++ b/claimtrie/cmd/cmd/node.go @@ -6,10 +6,10 @@ import ( "math" "path/filepath" + "github.com/cockroachdb/errors" "github.com/lbryio/lbcd/claimtrie/change" "github.com/lbryio/lbcd/claimtrie/node" "github.com/lbryio/lbcd/claimtrie/node/noderepo" - "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/claimtrie/cmd/cmd/root.go b/claimtrie/cmd/cmd/root.go index 4be3d3a7..742b2d5e 100644 --- a/claimtrie/cmd/cmd/root.go +++ b/claimtrie/cmd/cmd/root.go @@ -3,10 +3,10 @@ package cmd import ( "os" + "github.com/btcsuite/btclog" "github.com/lbryio/lbcd/claimtrie/config" "github.com/lbryio/lbcd/claimtrie/param" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btclog" "github.com/spf13/cobra" ) diff --git a/claimtrie/config/config.go b/claimtrie/config/config.go index cf49127c..73e2fb33 100644 --- a/claimtrie/config/config.go +++ b/claimtrie/config/config.go @@ -4,7 +4,7 @@ import ( "path/filepath" "github.com/lbryio/lbcd/claimtrie/param" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) var DefaultConfig = Config{ diff --git a/claimtrie/merkletrie/collapsedtrie_test.go b/claimtrie/merkletrie/collapsedtrie_test.go index ce50b5d6..ce41c35f 100644 --- a/claimtrie/merkletrie/collapsedtrie_test.go +++ b/claimtrie/merkletrie/collapsedtrie_test.go @@ -2,10 +2,11 @@ package merkletrie import ( "bytes" - "github.com/stretchr/testify/assert" "math/rand" "testing" "time" + + "github.com/stretchr/testify/assert" ) func b(value string) []byte { return []byte(value) } diff --git a/claimtrie/merkletrie/merkletrie.go b/claimtrie/merkletrie/merkletrie.go index a35eb870..3bc525fe 100644 --- a/claimtrie/merkletrie/merkletrie.go +++ b/claimtrie/merkletrie/merkletrie.go @@ -3,11 +3,12 @@ package merkletrie import ( "bytes" "fmt" - "github.com/pkg/errors" "runtime" "sort" "sync" + "github.com/pkg/errors" + "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/claimtrie/node" ) diff --git a/claimtrie/merkletrie/merkletrierepo/pebble.go b/claimtrie/merkletrie/merkletrierepo/pebble.go index 90bf320e..1c1d6f4f 100644 --- a/claimtrie/merkletrie/merkletrierepo/pebble.go +++ b/claimtrie/merkletrie/merkletrierepo/pebble.go @@ -1,9 +1,10 @@ package merkletrierepo import ( + "io" + "github.com/cockroachdb/pebble" "github.com/pkg/errors" - "io" ) type Pebble struct { diff --git a/claimtrie/node/log.go b/claimtrie/node/log.go index 02a9de2a..86293b58 100644 --- a/claimtrie/node/log.go +++ b/claimtrie/node/log.go @@ -1,8 +1,9 @@ package node import ( - "github.com/btcsuite/btclog" "sync" + + "github.com/btcsuite/btclog" ) // log is a logger that is initialized with no output filters. This diff --git a/claimtrie/node/manager.go b/claimtrie/node/manager.go index 6dc2b689..605b7123 100644 --- a/claimtrie/node/manager.go +++ b/claimtrie/node/manager.go @@ -2,9 +2,10 @@ package node import ( "fmt" - "github.com/pkg/errors" "sort" + "github.com/pkg/errors" + "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/claimtrie/change" "github.com/lbryio/lbcd/claimtrie/param" diff --git a/claimtrie/node/noderepo/pebble.go b/claimtrie/node/noderepo/pebble.go index 0f26247d..1a8142c6 100644 --- a/claimtrie/node/noderepo/pebble.go +++ b/claimtrie/node/noderepo/pebble.go @@ -4,8 +4,8 @@ import ( "bytes" "sort" - "github.com/lbryio/lbcd/claimtrie/change" "github.com/cockroachdb/pebble" + "github.com/lbryio/lbcd/claimtrie/change" "github.com/pkg/errors" ) diff --git a/claimtrie/normalization/normalizer_icu_test.go b/claimtrie/normalization/normalizer_icu_test.go index 31ddb4c2..ad402a89 100644 --- a/claimtrie/normalization/normalizer_icu_test.go +++ b/claimtrie/normalization/normalizer_icu_test.go @@ -4,9 +4,10 @@ package normalization import ( "encoding/hex" - "github.com/stretchr/testify/assert" "testing" "unicode/utf8" + + "github.com/stretchr/testify/assert" ) func TestNormalizationICU(t *testing.T) { @@ -28,4 +29,4 @@ func TestBlock760150(t *testing.T) { a = normalizeGo([]byte(test2)) b = normalizeICU([]byte(test2)) assert.Equal(t, a, b) -} \ No newline at end of file +} diff --git a/cmd/addblock/addblock.go b/cmd/addblock/addblock.go index 04a7cf86..b601779b 100644 --- a/cmd/addblock/addblock.go +++ b/cmd/addblock/addblock.go @@ -8,11 +8,11 @@ import ( "os" "path/filepath" + "github.com/btcsuite/btclog" "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/blockchain/indexers" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/limits" - "github.com/btcsuite/btclog" ) const ( diff --git a/cmd/addblock/config.go b/cmd/addblock/config.go index 09d381d0..d2c9dc0d 100644 --- a/cmd/addblock/config.go +++ b/cmd/addblock/config.go @@ -9,12 +9,12 @@ import ( "os" "path/filepath" + flags "github.com/jessevdk/go-flags" "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/database" _ "github.com/lbryio/lbcd/database/ffldb" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" - flags "github.com/jessevdk/go-flags" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/cmd/addblock/import.go b/cmd/addblock/import.go index 88958399..34117ecd 100644 --- a/cmd/addblock/import.go +++ b/cmd/addblock/import.go @@ -16,7 +16,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) var zeroHash = chainhash.Hash{} diff --git a/cmd/findcheckpoint/config.go b/cmd/findcheckpoint/config.go index f50fbc80..7a16069a 100644 --- a/cmd/findcheckpoint/config.go +++ b/cmd/findcheckpoint/config.go @@ -9,12 +9,12 @@ import ( "os" "path/filepath" + flags "github.com/jessevdk/go-flags" "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/database" _ "github.com/lbryio/lbcd/database/ffldb" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" - flags "github.com/jessevdk/go-flags" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/cmd/gencerts/gencerts.go b/cmd/gencerts/gencerts.go index 27d1073e..3bce5d17 100644 --- a/cmd/gencerts/gencerts.go +++ b/cmd/gencerts/gencerts.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/btcsuite/btcutil" flags "github.com/jessevdk/go-flags" + btcutil "github.com/lbryio/lbcutil" ) type config struct { diff --git a/cmd/lbcctl/config.go b/cmd/lbcctl/config.go index 83e660da..bab6bb18 100644 --- a/cmd/lbcctl/config.go +++ b/cmd/lbcctl/config.go @@ -13,10 +13,10 @@ import ( "regexp" "strings" + flags "github.com/jessevdk/go-flags" "github.com/lbryio/lbcd/btcjson" "github.com/lbryio/lbcd/chaincfg" - "github.com/btcsuite/btcutil" - flags "github.com/jessevdk/go-flags" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/cmd/lbcctl/httpclient.go b/cmd/lbcctl/httpclient.go index c9259004..e7ffd205 100644 --- a/cmd/lbcctl/httpclient.go +++ b/cmd/lbcctl/httpclient.go @@ -10,8 +10,8 @@ import ( "net" "net/http" - "github.com/lbryio/lbcd/btcjson" "github.com/btcsuite/go-socks/socks" + "github.com/lbryio/lbcd/btcjson" ) // newHTTPClient returns a new HTTP client that is configured according to the diff --git a/config.go b/config.go index 03f60168..4e9d7cf1 100644 --- a/config.go +++ b/config.go @@ -21,6 +21,8 @@ import ( "strings" "time" + "github.com/btcsuite/go-socks/socks" + flags "github.com/jessevdk/go-flags" "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/chaincfg/chainhash" @@ -29,9 +31,7 @@ import ( _ "github.com/lbryio/lbcd/database/ffldb" "github.com/lbryio/lbcd/mempool" "github.com/lbryio/lbcd/peer" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/go-socks/socks" - flags "github.com/jessevdk/go-flags" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/database/cmd/dbtool/globalconfig.go b/database/cmd/dbtool/globalconfig.go index e1bbd7fa..8d19c2b1 100644 --- a/database/cmd/dbtool/globalconfig.go +++ b/database/cmd/dbtool/globalconfig.go @@ -14,7 +14,7 @@ import ( "github.com/lbryio/lbcd/database" _ "github.com/lbryio/lbcd/database/ffldb" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) var ( diff --git a/database/cmd/dbtool/insecureimport.go b/database/cmd/dbtool/insecureimport.go index 1756973e..442873c9 100644 --- a/database/cmd/dbtool/insecureimport.go +++ b/database/cmd/dbtool/insecureimport.go @@ -15,7 +15,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // importCmd defines the configuration options for the insecureimport command. diff --git a/database/cmd/dbtool/main.go b/database/cmd/dbtool/main.go index c321bfc9..c7fb6a45 100644 --- a/database/cmd/dbtool/main.go +++ b/database/cmd/dbtool/main.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/lbryio/lbcd/database" "github.com/btcsuite/btclog" flags "github.com/jessevdk/go-flags" + "github.com/lbryio/lbcd/database" ) const ( diff --git a/database/ffldb/db.go b/database/ffldb/db.go index 4008d8a1..31dda789 100644 --- a/database/ffldb/db.go +++ b/database/ffldb/db.go @@ -14,11 +14,6 @@ import ( "sort" "sync" - "github.com/lbryio/lbcd/chaincfg/chainhash" - "github.com/lbryio/lbcd/database" - "github.com/lbryio/lbcd/database/ffldb/treap" - "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" "github.com/btcsuite/goleveldb/leveldb" "github.com/btcsuite/goleveldb/leveldb/comparer" ldberrors "github.com/btcsuite/goleveldb/leveldb/errors" @@ -26,6 +21,11 @@ import ( "github.com/btcsuite/goleveldb/leveldb/iterator" "github.com/btcsuite/goleveldb/leveldb/opt" "github.com/btcsuite/goleveldb/leveldb/util" + "github.com/lbryio/lbcd/chaincfg/chainhash" + "github.com/lbryio/lbcd/database" + "github.com/lbryio/lbcd/database/ffldb/treap" + "github.com/lbryio/lbcd/wire" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/database/ffldb/dbcache.go b/database/ffldb/dbcache.go index 5160cd29..39197d82 100644 --- a/database/ffldb/dbcache.go +++ b/database/ffldb/dbcache.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/lbryio/lbcd/database/ffldb/treap" "github.com/btcsuite/goleveldb/leveldb" "github.com/btcsuite/goleveldb/leveldb/iterator" "github.com/btcsuite/goleveldb/leveldb/util" + "github.com/lbryio/lbcd/database/ffldb/treap" ) const ( diff --git a/database/ffldb/driver.go b/database/ffldb/driver.go index 5af68953..39a1e02b 100644 --- a/database/ffldb/driver.go +++ b/database/ffldb/driver.go @@ -7,9 +7,9 @@ package ffldb import ( "fmt" + "github.com/btcsuite/btclog" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btclog" ) var log = btclog.Disabled diff --git a/database/ffldb/interface_test.go b/database/ffldb/interface_test.go index f8ad7baf..b93f9173 100644 --- a/database/ffldb/interface_test.go +++ b/database/ffldb/interface_test.go @@ -29,7 +29,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) var ( diff --git a/database/ffldb/ldbtreapiter.go b/database/ffldb/ldbtreapiter.go index 072bf43b..70d48e7c 100644 --- a/database/ffldb/ldbtreapiter.go +++ b/database/ffldb/ldbtreapiter.go @@ -5,9 +5,9 @@ package ffldb import ( - "github.com/lbryio/lbcd/database/ffldb/treap" "github.com/btcsuite/goleveldb/leveldb/iterator" "github.com/btcsuite/goleveldb/leveldb/util" + "github.com/lbryio/lbcd/database/ffldb/treap" ) // ldbTreapIter wraps a treap iterator to provide the additional functionality diff --git a/database/interface.go b/database/interface.go index 3290b281..5b566f11 100644 --- a/database/interface.go +++ b/database/interface.go @@ -9,7 +9,7 @@ package database import ( "github.com/lbryio/lbcd/chaincfg/chainhash" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // Cursor represents a cursor over key/value pairs and nested buckets of a diff --git a/docs/json_rpc_api.md b/docs/json_rpc_api.md index 36ae6f60..f902b39d 100644 --- a/docs/json_rpc_api.md +++ b/docs/json_rpc_api.md @@ -1092,7 +1092,7 @@ import ( "path/filepath" "github.com/lbryio/lbcd/rpcclient" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) func main() { @@ -1156,7 +1156,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/rpcclient" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) func main() { @@ -1248,7 +1248,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/rpcclient" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) func main() { diff --git a/go.mod b/go.mod index 7476ab6c..f75cc542 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,7 @@ module github.com/lbryio/lbcd go 1.16 require ( - github.com/btcsuite/btcd v0.22.0-beta // indirect github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f - github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd github.com/btcsuite/goleveldb v1.0.0 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 @@ -18,11 +16,12 @@ require ( github.com/jessevdk/go-flags v1.4.0 github.com/jrick/logrotate v1.0.0 github.com/kkdai/bstream v1.0.0 // indirect + github.com/lbryio/lbcutil v1.0.200 github.com/pkg/errors v0.9.1 github.com/shirou/gopsutil/v3 v3.21.7 github.com/spf13/cobra v1.1.3 github.com/stretchr/testify v1.7.0 github.com/vmihailenco/msgpack/v5 v5.3.2 - golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 golang.org/x/text v0.3.6 ) diff --git a/go.sum b/go.sum index f1abf6ef..410dd82a 100644 --- a/go.sum +++ b/go.sum @@ -44,7 +44,6 @@ github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= @@ -253,6 +252,12 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/lbryio/lbcd v0.22.100-beta/go.mod h1:u8SaFX4xdGMMR5xasBGfgApC8pvD4rnK2OujZnrq5gs= +github.com/lbryio/lbcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= +github.com/lbryio/lbcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= +github.com/lbryio/lbcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= +github.com/lbryio/lbcutil v1.0.200 h1:MtNH3ZbpLoSM64Vplt+H7EavFxZ2YxhJJ94b4oyBMxc= +github.com/lbryio/lbcutil v1.0.200/go.mod h1:gDHc/b+Rdz3J7+VB8e5/Bl9roVf8Q5/8FQCyuK9dXD0= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -397,6 +402,8 @@ golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -477,6 +484,7 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/integration/rpctest/blockgen.go b/integration/rpctest/blockgen.go index 02651db0..dae3b7fd 100644 --- a/integration/rpctest/blockgen.go +++ b/integration/rpctest/blockgen.go @@ -17,7 +17,7 @@ import ( "github.com/lbryio/lbcd/mining" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // solveBlock attempts to find a nonce which makes the passed block header hash diff --git a/integration/rpctest/memwallet.go b/integration/rpctest/memwallet.go index 4c69163e..c1374ef3 100644 --- a/integration/rpctest/memwallet.go +++ b/integration/rpctest/memwallet.go @@ -17,8 +17,8 @@ import ( "github.com/lbryio/lbcd/rpcclient" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/hdkeychain" + btcutil "github.com/lbryio/lbcutil" + "github.com/lbryio/lbcutil/hdkeychain" ) var ( diff --git a/integration/rpctest/node.go b/integration/rpctest/node.go index be0a04eb..2c7644b8 100644 --- a/integration/rpctest/node.go +++ b/integration/rpctest/node.go @@ -15,7 +15,7 @@ import ( "time" rpc "github.com/lbryio/lbcd/rpcclient" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // nodeConfig contains all the args, and data required to launch a btcd process diff --git a/integration/rpctest/rpc_harness.go b/integration/rpctest/rpc_harness.go index 518d262a..1d1eaefa 100644 --- a/integration/rpctest/rpc_harness.go +++ b/integration/rpctest/rpc_harness.go @@ -20,7 +20,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/rpcclient" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/mempool/estimatefee.go b/mempool/estimatefee.go index 506962aa..719c42e2 100644 --- a/mempool/estimatefee.go +++ b/mempool/estimatefee.go @@ -18,7 +18,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/mining" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // TODO incorporate Alex Morcos' modifications to Gavin's initial model diff --git a/mempool/estimatefee_test.go b/mempool/estimatefee_test.go index 66434b32..6f86d035 100644 --- a/mempool/estimatefee_test.go +++ b/mempool/estimatefee_test.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/mining" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // newTestFeeEstimator creates a feeEstimator with some different parameters diff --git a/mempool/mempool.go b/mempool/mempool.go index fe9a21e2..c52d9d39 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -20,7 +20,7 @@ import ( "github.com/lbryio/lbcd/mining" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/mempool/policy.go b/mempool/policy.go index af208306..46f083c5 100644 --- a/mempool/policy.go +++ b/mempool/policy.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/mining/cpuminer/cpuminer.go b/mining/cpuminer/cpuminer.go index 31431683..67803943 100644 --- a/mining/cpuminer/cpuminer.go +++ b/mining/cpuminer/cpuminer.go @@ -17,7 +17,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/mining" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/mining/mining.go b/mining/mining.go index 60249192..6eb00316 100644 --- a/mining/mining.go +++ b/mining/mining.go @@ -15,7 +15,7 @@ import ( "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/mining/mining_test.go b/mining/mining_test.go index 362253e5..f2a65419 100644 --- a/mining/mining_test.go +++ b/mining/mining_test.go @@ -9,7 +9,7 @@ import ( "math/rand" "testing" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // TestTxFeePrioHeap ensures the priority queue for transaction fees and diff --git a/mining/policy.go b/mining/policy.go index 3d5efcb7..040095f9 100644 --- a/mining/policy.go +++ b/mining/policy.go @@ -7,7 +7,7 @@ package mining import ( "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/mining/policy_test.go b/mining/policy_test.go index 25ae5448..e7ababfa 100644 --- a/mining/policy_test.go +++ b/mining/policy_test.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // newHashFromStr converts the passed big-endian hex string into a diff --git a/netsync/blocklogger.go b/netsync/blocklogger.go index 18480e78..34a549a1 100644 --- a/netsync/blocklogger.go +++ b/netsync/blocklogger.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btclog" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // blockProgressLogger provides periodic logging for other services in order diff --git a/netsync/interface.go b/netsync/interface.go index 0a2179d4..9361bfbc 100644 --- a/netsync/interface.go +++ b/netsync/interface.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/mempool" "github.com/lbryio/lbcd/peer" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // PeerNotifier exposes methods to notify peers of status changes to diff --git a/netsync/manager.go b/netsync/manager.go index 28cf3be8..69093610 100644 --- a/netsync/manager.go +++ b/netsync/manager.go @@ -19,7 +19,7 @@ import ( "github.com/lbryio/lbcd/mempool" peerpkg "github.com/lbryio/lbcd/peer" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/peer/log.go b/peer/log.go index f13da67a..a96b8e50 100644 --- a/peer/log.go +++ b/peer/log.go @@ -9,10 +9,10 @@ import ( "strings" "time" + "github.com/btcsuite/btclog" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btclog" ) const ( diff --git a/peer/peer.go b/peer/peer.go index bc9eb46b..5b94931b 100644 --- a/peer/peer.go +++ b/peer/peer.go @@ -18,13 +18,13 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/go-socks/socks" + "github.com/davecgh/go-spew/spew" + "github.com/decred/dcrd/lru" "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/go-socks/socks" - "github.com/davecgh/go-spew/spew" - "github.com/decred/dcrd/lru" ) const ( diff --git a/resourceLogging.go b/resourceLogging.go index 2323d082..d6e92051 100644 --- a/resourceLogging.go +++ b/resourceLogging.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/mem" "github.com/shirou/gopsutil/v3/process" diff --git a/rpcadapters.go b/rpcadapters.go index 613167a5..2a1af72f 100644 --- a/rpcadapters.go +++ b/rpcadapters.go @@ -13,7 +13,7 @@ import ( "github.com/lbryio/lbcd/netsync" "github.com/lbryio/lbcd/peer" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // rpcPeer provides a peer for use with the RPC server and implements the diff --git a/rpcclient/example_test.go b/rpcclient/example_test.go index a38229f3..f044e9f1 100644 --- a/rpcclient/example_test.go +++ b/rpcclient/example_test.go @@ -6,6 +6,7 @@ package rpcclient import ( "fmt" + "github.com/lbryio/lbcd/btcjson" ) diff --git a/rpcclient/examples/btcdwebsockets/main.go b/rpcclient/examples/btcdwebsockets/main.go index 00eb3fac..1a12da9e 100644 --- a/rpcclient/examples/btcdwebsockets/main.go +++ b/rpcclient/examples/btcdwebsockets/main.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/rpcclient" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) func main() { diff --git a/rpcclient/examples/btcwalletwebsockets/main.go b/rpcclient/examples/btcwalletwebsockets/main.go index 7a9ce9a8..b0bc6f83 100644 --- a/rpcclient/examples/btcwalletwebsockets/main.go +++ b/rpcclient/examples/btcwalletwebsockets/main.go @@ -10,9 +10,9 @@ import ( "path/filepath" "time" - "github.com/lbryio/lbcd/rpcclient" - "github.com/btcsuite/btcutil" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/rpcclient" + btcutil "github.com/lbryio/lbcutil" ) func main() { diff --git a/rpcclient/extensions.go b/rpcclient/extensions.go index b4b3684a..3e064d92 100644 --- a/rpcclient/extensions.go +++ b/rpcclient/extensions.go @@ -15,7 +15,7 @@ import ( "github.com/lbryio/lbcd/btcjson" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // FutureDebugLevelResult is a future promise to deliver the result of a diff --git a/rpcclient/infrastructure.go b/rpcclient/infrastructure.go index e30f8c5f..592c0dde 100644 --- a/rpcclient/infrastructure.go +++ b/rpcclient/infrastructure.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" - "github.com/lbryio/lbcd/btcjson" - "github.com/lbryio/lbcd/chaincfg" "github.com/btcsuite/go-socks/socks" "github.com/btcsuite/websocket" + "github.com/lbryio/lbcd/btcjson" + "github.com/lbryio/lbcd/chaincfg" ) var ( diff --git a/rpcclient/mining.go b/rpcclient/mining.go index 9e6f148b..b27a72b8 100644 --- a/rpcclient/mining.go +++ b/rpcclient/mining.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/btcjson" "github.com/lbryio/lbcd/chaincfg/chainhash" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // FutureGenerateResult is a future promise to deliver the result of a diff --git a/rpcclient/notify.go b/rpcclient/notify.go index 87b5383f..7dc38e00 100644 --- a/rpcclient/notify.go +++ b/rpcclient/notify.go @@ -16,7 +16,7 @@ import ( "github.com/lbryio/lbcd/btcjson" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) var ( diff --git a/rpcclient/rawtransactions.go b/rpcclient/rawtransactions.go index bdf1bbbb..f779fa50 100644 --- a/rpcclient/rawtransactions.go +++ b/rpcclient/rawtransactions.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/btcjson" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/rpcclient/wallet.go b/rpcclient/wallet.go index 771f3f0f..4d6cdea0 100644 --- a/rpcclient/wallet.go +++ b/rpcclient/wallet.go @@ -12,7 +12,7 @@ import ( "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // ***************************** diff --git a/rpcserver.go b/rpcserver.go index c6267366..f337668a 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -27,6 +27,7 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/websocket" "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/blockchain/indexers" "github.com/lbryio/lbcd/btcec" @@ -40,8 +41,7 @@ import ( "github.com/lbryio/lbcd/peer" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/websocket" + btcutil "github.com/lbryio/lbcutil" ) // API version constants diff --git a/rpcwebsocket.go b/rpcwebsocket.go index 604df459..dd18686a 100644 --- a/rpcwebsocket.go +++ b/rpcwebsocket.go @@ -20,6 +20,7 @@ import ( "sync" "time" + "github.com/btcsuite/websocket" "github.com/lbryio/lbcd/blockchain" "github.com/lbryio/lbcd/btcjson" "github.com/lbryio/lbcd/chaincfg" @@ -27,8 +28,7 @@ import ( "github.com/lbryio/lbcd/database" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/websocket" + btcutil "github.com/lbryio/lbcutil" "golang.org/x/crypto/ripemd160" ) diff --git a/server.go b/server.go index a9bf64a0..0e57f622 100644 --- a/server.go +++ b/server.go @@ -38,8 +38,8 @@ import ( "github.com/lbryio/lbcd/peer" "github.com/lbryio/lbcd/txscript" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/bloom" + btcutil "github.com/lbryio/lbcutil" + "github.com/lbryio/lbcutil/bloom" ) const ( diff --git a/txscript/hashcache_test.go b/txscript/hashcache_test.go index 48249cdd..c1373497 100644 --- a/txscript/hashcache_test.go +++ b/txscript/hashcache_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/lbryio/lbcd/wire" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/wire" ) func init() { diff --git a/txscript/pkscript.go b/txscript/pkscript.go index 0bf28dcd..fede5158 100644 --- a/txscript/pkscript.go +++ b/txscript/pkscript.go @@ -8,7 +8,7 @@ import ( "github.com/lbryio/lbcd/btcec" "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" "golang.org/x/crypto/ripemd160" ) diff --git a/txscript/sign.go b/txscript/sign.go index ad5f0f69..5900d02e 100644 --- a/txscript/sign.go +++ b/txscript/sign.go @@ -11,7 +11,7 @@ import ( "github.com/lbryio/lbcd/btcec" "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) // RawTxInWitnessSignature returns the serialized ECDA signature for the input diff --git a/txscript/sign_test.go b/txscript/sign_test.go index 9d84ef83..abed8c36 100644 --- a/txscript/sign_test.go +++ b/txscript/sign_test.go @@ -13,7 +13,7 @@ import ( "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) type addressToKey struct { diff --git a/txscript/standard.go b/txscript/standard.go index dcc07ee0..0ff22f05 100644 --- a/txscript/standard.go +++ b/txscript/standard.go @@ -9,7 +9,7 @@ import ( "github.com/lbryio/lbcd/chaincfg" "github.com/lbryio/lbcd/wire" - "github.com/btcsuite/btcutil" + btcutil "github.com/lbryio/lbcutil" ) const ( diff --git a/wire/invvect_test.go b/wire/invvect_test.go index 993debba..1be745c3 100644 --- a/wire/invvect_test.go +++ b/wire/invvect_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/chaincfg/chainhash" ) // TestInvVectStringer tests the stringized output for inventory vector types. diff --git a/wire/msggetdata_test.go b/wire/msggetdata_test.go index 9071d60e..9e34f296 100644 --- a/wire/msggetdata_test.go +++ b/wire/msggetdata_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/chaincfg/chainhash" ) // TestGetData tests the MsgGetData API. diff --git a/wire/msginv_test.go b/wire/msginv_test.go index 96b0eec8..09aa6732 100644 --- a/wire/msginv_test.go +++ b/wire/msginv_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/chaincfg/chainhash" ) // TestInv tests the MsgInv API. diff --git a/wire/msgnotfound_test.go b/wire/msgnotfound_test.go index cf9c3645..7cb6cf7b 100644 --- a/wire/msgnotfound_test.go +++ b/wire/msgnotfound_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/chaincfg/chainhash" ) // TestNotFound tests the MsgNotFound API. diff --git a/wire/msgtx_test.go b/wire/msgtx_test.go index 84d28bc6..11f67293 100644 --- a/wire/msgtx_test.go +++ b/wire/msgtx_test.go @@ -11,8 +11,8 @@ import ( "reflect" "testing" - "github.com/lbryio/lbcd/chaincfg/chainhash" "github.com/davecgh/go-spew/spew" + "github.com/lbryio/lbcd/chaincfg/chainhash" ) // TestTx tests the MsgTx API.