From ab077d882cb8fa66b932786170c282e1583dfefd Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Fri, 4 Jan 2019 13:36:16 +0100 Subject: [PATCH] Update references to forked btcd, btcutil and bchutil libraries --- Gopkg.lock | 12 ++++++------ Gopkg.toml | 4 ++-- bchain/coins/bch/bcashparser.go | 8 ++++---- bchain/coins/bch/bcashparser_test.go | 2 +- bchain/coins/bch/bcashrpc.go | 2 +- bchain/coins/btc/bitcoinparser.go | 10 +++++----- bchain/coins/btc/bitcoinparser_test.go | 2 +- bchain/coins/btc/bitcoinrpc.go | 3 +-- bchain/coins/btg/bgoldparser.go | 6 +++--- bchain/coins/btg/bgoldparser_test.go | 2 +- bchain/coins/dash/dashparser.go | 4 ++-- bchain/coins/digibyte/digibyteparser.go | 4 ++-- bchain/coins/digibyte/digibyteparser_test.go | 2 +- bchain/coins/dogecoin/dogecoinparser.go | 4 ++-- bchain/coins/dogecoin/dogecoinparser_test.go | 2 +- bchain/coins/gamecredits/gamecreditsparser.go | 4 ++-- bchain/coins/gamecredits/gamecreditsparser_test.go | 2 +- bchain/coins/grs/grsparser.go | 6 +++--- bchain/coins/grs/grsparser_test.go | 2 +- bchain/coins/litecoin/litecoinparser.go | 4 ++-- bchain/coins/litecoin/litecoinparser_test.go | 2 +- bchain/coins/monacoin/monacoinparser.go | 4 ++-- bchain/coins/monacoin/monacoinparser_test.go | 2 +- bchain/coins/myriad/myriadparser.go | 4 ++-- bchain/coins/myriad/myriadparser_test.go | 2 +- bchain/coins/namecoin/namecoinparser.go | 4 ++-- bchain/coins/namecoin/namecoinparser_test.go | 2 +- bchain/coins/utils/parserutils.go | 2 +- bchain/coins/vertcoin/vertcoinparser.go | 4 ++-- bchain/coins/vertcoin/vertcoinparser_test.go | 2 +- bchain/coins/zec/zcashparser.go | 4 ++-- bchain/coins/zec/zcashparser_test.go | 2 +- db/rocksdb_test.go | 2 +- server/public_test.go | 2 +- tests/integration.go | 2 +- 35 files changed, 62 insertions(+), 63 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index cf32c2f0..f0002a3d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -21,9 +21,9 @@ [[projects]] branch = "master" - name = "github.com/btcsuite/btcd" + name = "github.com/martinboehm/btcd" packages = ["blockchain","btcec","chaincfg","chaincfg/chainhash","database","txscript","wire"] - revision = "2be2f12b358dc57d70b8f501b00be450192efbc3" + revision = "8e7c0427fee5d4778c5d4eb987150369e3ca1d0e" [[projects]] branch = "master" @@ -93,15 +93,15 @@ [[projects]] branch = "master" - name = "github.com/jakm/bchutil" + name = "github.com/martinboehm/bchutil" packages = ["."] - revision = "5a273ca8a96628732c07ff5cfb9f3e7d965241e8" + revision = "6373f11b6efe1ea81e8713b8788a695b2c144d38" [[projects]] branch = "master" - name = "github.com/jakm/btcutil" + name = "github.com/martinboehm/btcutil" packages = [".","base58","bech32","chaincfg","txscript"] - revision = "224b76333062172edefdeb502123fdda12205f76" + revision = "613fec26904062ae125fb073762af3a77c77b6c7" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index d9c354a1..06666058 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -27,11 +27,11 @@ [[constraint]] branch = "master" - name = "github.com/btcsuite/btcd" + name = "github.com/martinboehm/btcd" [[constraint]] branch = "master" - name = "github.com/btcsuite/btcutil" + name = "github.com/martinboehm/btcutil" [[constraint]] branch = "master" diff --git a/bchain/coins/bch/bcashparser.go b/bchain/coins/bch/bcashparser.go index d0d48730..f940c808 100644 --- a/bchain/coins/bch/bcashparser.go +++ b/bchain/coins/bch/bcashparser.go @@ -5,10 +5,10 @@ import ( "blockbook/bchain/coins/btc" "fmt" - "github.com/jakm/bchutil" - "github.com/jakm/btcutil" - "github.com/jakm/btcutil/chaincfg" - "github.com/jakm/btcutil/txscript" + "github.com/martinboehm/bchutil" + "github.com/martinboehm/btcutil" + "github.com/martinboehm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/txscript" "github.com/schancel/cashaddr-converter/address" ) diff --git a/bchain/coins/bch/bcashparser_test.go b/bchain/coins/bch/bcashparser_test.go index b349911c..612cbab8 100644 --- a/bchain/coins/bch/bcashparser_test.go +++ b/bchain/coins/bch/bcashparser_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/bch/bcashrpc.go b/bchain/coins/bch/bcashrpc.go index ce374430..bba9d785 100644 --- a/bchain/coins/bch/bcashrpc.go +++ b/bchain/coins/bch/bcashrpc.go @@ -8,8 +8,8 @@ import ( "math/big" "github.com/golang/glog" - "github.com/jakm/bchutil" "github.com/juju/errors" + "github.com/martinboehm/bchutil" ) // BCashRPC is an interface to JSON-RPC bitcoind service. diff --git a/bchain/coins/btc/bitcoinparser.go b/bchain/coins/btc/bitcoinparser.go index 38084c6b..aaa04328 100644 --- a/bchain/coins/btc/bitcoinparser.go +++ b/bchain/coins/btc/bitcoinparser.go @@ -8,11 +8,11 @@ import ( "math/big" vlq "github.com/bsm/go-vlq" - "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil" - "github.com/jakm/btcutil/chaincfg" - "github.com/jakm/btcutil/txscript" + "github.com/martinboehm/btcd/blockchain" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil" + "github.com/martinboehm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/txscript" ) // OutputScriptToAddressesFunc converts ScriptPubKey to bitcoin addresses diff --git a/bchain/coins/btc/bitcoinparser_test.go b/bchain/coins/btc/bitcoinparser_test.go index d1fc4940..e3062215 100644 --- a/bchain/coins/btc/bitcoinparser_test.go +++ b/bchain/coins/btc/bitcoinparser_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/btc/bitcoinrpc.go b/bchain/coins/btc/bitcoinrpc.go index dfecbf71..6a16df21 100644 --- a/bchain/coins/btc/bitcoinrpc.go +++ b/bchain/coins/btc/bitcoinrpc.go @@ -13,10 +13,9 @@ import ( "net/http" "time" - "github.com/btcsuite/btcd/wire" - "github.com/golang/glog" "github.com/juju/errors" + "github.com/martinboehm/btcd/wire" ) // BitcoinRPC is an interface to JSON-RPC bitcoind service. diff --git a/bchain/coins/btg/bgoldparser.go b/bchain/coins/btg/bgoldparser.go index a2a06127..d21a2575 100644 --- a/bchain/coins/btg/bgoldparser.go +++ b/bchain/coins/btg/bgoldparser.go @@ -8,9 +8,9 @@ import ( "encoding/binary" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/chaincfg/chainhash" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/btg/bgoldparser_test.go b/bchain/coins/btg/bgoldparser_test.go index 4a6ed6ed..cff75f78 100644 --- a/bchain/coins/btg/bgoldparser_test.go +++ b/bchain/coins/btg/bgoldparser_test.go @@ -12,7 +12,7 @@ import ( "path/filepath" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/dash/dashparser.go b/bchain/coins/dash/dashparser.go index e70af2f9..6bb014c2 100644 --- a/bchain/coins/dash/dashparser.go +++ b/bchain/coins/dash/dashparser.go @@ -3,8 +3,8 @@ package dash import ( "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/digibyte/digibyteparser.go b/bchain/coins/digibyte/digibyteparser.go index 17973d56..c374958a 100644 --- a/bchain/coins/digibyte/digibyteparser.go +++ b/bchain/coins/digibyte/digibyteparser.go @@ -3,8 +3,8 @@ package digibyte import ( "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/digibyte/digibyteparser_test.go b/bchain/coins/digibyte/digibyteparser_test.go index cc2ef5ba..ff90c056 100644 --- a/bchain/coins/digibyte/digibyteparser_test.go +++ b/bchain/coins/digibyte/digibyteparser_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/dogecoin/dogecoinparser.go b/bchain/coins/dogecoin/dogecoinparser.go index 9c115f8c..109a28ad 100644 --- a/bchain/coins/dogecoin/dogecoinparser.go +++ b/bchain/coins/dogecoin/dogecoinparser.go @@ -6,8 +6,8 @@ import ( "blockbook/bchain/coins/utils" "bytes" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/dogecoin/dogecoinparser_test.go b/bchain/coins/dogecoin/dogecoinparser_test.go index f82ae434..bf7f08e1 100644 --- a/bchain/coins/dogecoin/dogecoinparser_test.go +++ b/bchain/coins/dogecoin/dogecoinparser_test.go @@ -15,7 +15,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/gamecredits/gamecreditsparser.go b/bchain/coins/gamecredits/gamecreditsparser.go index 39c2808c..225481ac 100644 --- a/bchain/coins/gamecredits/gamecreditsparser.go +++ b/bchain/coins/gamecredits/gamecreditsparser.go @@ -3,8 +3,8 @@ package gamecredits import ( "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/gamecredits/gamecreditsparser_test.go b/bchain/coins/gamecredits/gamecreditsparser_test.go index 17074f6b..ee63e9fe 100644 --- a/bchain/coins/gamecredits/gamecreditsparser_test.go +++ b/bchain/coins/gamecredits/gamecreditsparser_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/grs/grsparser.go b/bchain/coins/grs/grsparser.go index 9c560b63..651f922a 100644 --- a/bchain/coins/grs/grsparser.go +++ b/bchain/coins/grs/grsparser.go @@ -4,9 +4,9 @@ import ( "blockbook/bchain" "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/base58" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/base58" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/grs/grsparser_test.go b/bchain/coins/grs/grsparser_test.go index 5b40ec38..65dd5c9f 100644 --- a/bchain/coins/grs/grsparser_test.go +++ b/bchain/coins/grs/grsparser_test.go @@ -12,7 +12,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) var ( diff --git a/bchain/coins/litecoin/litecoinparser.go b/bchain/coins/litecoin/litecoinparser.go index 6a8066b7..e2557a93 100644 --- a/bchain/coins/litecoin/litecoinparser.go +++ b/bchain/coins/litecoin/litecoinparser.go @@ -3,8 +3,8 @@ package litecoin import ( "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/litecoin/litecoinparser_test.go b/bchain/coins/litecoin/litecoinparser_test.go index 2ab4744f..d84c541e 100644 --- a/bchain/coins/litecoin/litecoinparser_test.go +++ b/bchain/coins/litecoin/litecoinparser_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/monacoin/monacoinparser.go b/bchain/coins/monacoin/monacoinparser.go index aa03b8f3..47cd72ed 100644 --- a/bchain/coins/monacoin/monacoinparser.go +++ b/bchain/coins/monacoin/monacoinparser.go @@ -3,8 +3,8 @@ package monacoin import ( "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/monacoin/monacoinparser_test.go b/bchain/coins/monacoin/monacoinparser_test.go index 603a082e..21326c49 100644 --- a/bchain/coins/monacoin/monacoinparser_test.go +++ b/bchain/coins/monacoin/monacoinparser_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/myriad/myriadparser.go b/bchain/coins/myriad/myriadparser.go index 21572a7b..deac7509 100644 --- a/bchain/coins/myriad/myriadparser.go +++ b/bchain/coins/myriad/myriadparser.go @@ -6,8 +6,8 @@ import ( "blockbook/bchain/coins/utils" "bytes" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/myriad/myriadparser_test.go b/bchain/coins/myriad/myriadparser_test.go index 7815f844..56fdcc8c 100644 --- a/bchain/coins/myriad/myriadparser_test.go +++ b/bchain/coins/myriad/myriadparser_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/namecoin/namecoinparser.go b/bchain/coins/namecoin/namecoinparser.go index 59e2445a..261afefc 100644 --- a/bchain/coins/namecoin/namecoinparser.go +++ b/bchain/coins/namecoin/namecoinparser.go @@ -6,8 +6,8 @@ import ( "blockbook/bchain/coins/utils" "bytes" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/namecoin/namecoinparser_test.go b/bchain/coins/namecoin/namecoinparser_test.go index dc04a31e..b46a0173 100644 --- a/bchain/coins/namecoin/namecoinparser_test.go +++ b/bchain/coins/namecoin/namecoinparser_test.go @@ -13,7 +13,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/utils/parserutils.go b/bchain/coins/utils/parserutils.go index c59979ed..36fafa06 100644 --- a/bchain/coins/utils/parserutils.go +++ b/bchain/coins/utils/parserutils.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/wire" + "github.com/martinboehm/btcd/wire" ) // minTxPayload is the minimum payload size for a transaction. Note diff --git a/bchain/coins/vertcoin/vertcoinparser.go b/bchain/coins/vertcoin/vertcoinparser.go index ab28083e..1acbc732 100644 --- a/bchain/coins/vertcoin/vertcoinparser.go +++ b/bchain/coins/vertcoin/vertcoinparser.go @@ -3,8 +3,8 @@ package vertcoin import ( "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/vertcoin/vertcoinparser_test.go b/bchain/coins/vertcoin/vertcoinparser_test.go index ec86cd67..bfda7787 100644 --- a/bchain/coins/vertcoin/vertcoinparser_test.go +++ b/bchain/coins/vertcoin/vertcoinparser_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) func TestMain(m *testing.M) { diff --git a/bchain/coins/zec/zcashparser.go b/bchain/coins/zec/zcashparser.go index f2b2c5e9..1a1ed72b 100644 --- a/bchain/coins/zec/zcashparser.go +++ b/bchain/coins/zec/zcashparser.go @@ -4,8 +4,8 @@ import ( "blockbook/bchain" "blockbook/bchain/coins/btc" - "github.com/btcsuite/btcd/wire" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcd/wire" + "github.com/martinboehm/btcutil/chaincfg" ) const ( diff --git a/bchain/coins/zec/zcashparser_test.go b/bchain/coins/zec/zcashparser_test.go index 18a6b4a7..07758aa7 100644 --- a/bchain/coins/zec/zcashparser_test.go +++ b/bchain/coins/zec/zcashparser_test.go @@ -12,7 +12,7 @@ import ( "reflect" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) var ( diff --git a/db/rocksdb_test.go b/db/rocksdb_test.go index 771bde20..952ba6ec 100644 --- a/db/rocksdb_test.go +++ b/db/rocksdb_test.go @@ -19,8 +19,8 @@ import ( "testing" vlq "github.com/bsm/go-vlq" - "github.com/jakm/btcutil/chaincfg" "github.com/juju/errors" + "github.com/martinboehm/btcutil/chaincfg" ) // simplified explanation of signed varint packing, used in many index data structures diff --git a/server/public_test.go b/server/public_test.go index f2f2a4ba..1256e191 100644 --- a/server/public_test.go +++ b/server/public_test.go @@ -18,7 +18,7 @@ import ( "time" "github.com/golang/glog" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" "github.com/martinboehm/golang-socketio" "github.com/martinboehm/golang-socketio/transport" ) diff --git a/tests/integration.go b/tests/integration.go index 56a73ddb..ad0815f4 100644 --- a/tests/integration.go +++ b/tests/integration.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/jakm/btcutil/chaincfg" + "github.com/martinboehm/btcutil/chaincfg" ) type TestFunc func(t *testing.T, coin string, chain bchain.BlockChain, testConfig json.RawMessage)