From bad849b69df07ab5b98bfeb871dfef6d6fa2bf44 Mon Sep 17 00:00:00 2001 From: Donald Adu-Poku Date: Tue, 10 Nov 2020 22:19:46 +0000 Subject: [PATCH] multi: Start blockchain v4 module dev cycle. This updates the blockchain module version to v4 and updates import sites. --- blockchain/agendas_test.go | 2 +- blockchain/chain.go | 2 +- blockchain/chain_test.go | 2 +- blockchain/chaingen/example_test.go | 2 +- blockchain/common_test.go | 2 +- blockchain/example_test.go | 2 +- blockchain/fullblocks_test.go | 4 ++-- blockchain/fullblocksstakeversion_test.go | 2 +- blockchain/fullblocktests/generate.go | 4 ++-- blockchain/go.mod | 2 +- blockchain/indexers/manager.go | 2 +- blockchain/process_test.go | 2 +- blockchain/thresholdstate_test.go | 2 +- blockchain/treasury_test.go | 2 +- blockchain/utxoviewpoint_test.go | 2 +- blockchain/validate_test.go | 2 +- blockmanager.go | 2 +- cmd/addblock/addblock.go | 4 ++-- cmd/addblock/import.go | 4 ++-- cmd/findcheckpoint/findcheckpoint.go | 2 +- dcrd.go | 2 +- go.mod | 4 ++-- internal/mempool/error.go | 2 +- internal/mempool/mempool.go | 4 ++-- internal/mempool/mempool_test.go | 4 ++-- internal/mempool/policy.go | 2 +- internal/mining/bgblktmplgenerator.go | 2 +- internal/mining/cpuminer/cpuminer.go | 2 +- internal/mining/mining.go | 2 +- internal/rpcserver/interface.go | 4 ++-- internal/rpcserver/rpcserver.go | 2 +- internal/rpcserver/rpcserverhandlers_test.go | 4 ++-- internal/rpcserver/rpcwebsocket.go | 2 +- log.go | 4 ++-- rpcadaptors.go | 2 +- server.go | 4 ++-- 36 files changed, 47 insertions(+), 47 deletions(-) diff --git a/blockchain/agendas_test.go b/blockchain/agendas_test.go index adc5fda9..78e4de9c 100644 --- a/blockchain/agendas_test.go +++ b/blockchain/agendas_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/txscript/v3" diff --git a/blockchain/chain.go b/blockchain/chain.go index 0dbeedf3..e483071e 100644 --- a/blockchain/chain.go +++ b/blockchain/chain.go @@ -15,7 +15,7 @@ import ( "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/blockchain/chain_test.go b/blockchain/chain_test.go index 663f1105..6f6937ac 100644 --- a/blockchain/chain_test.go +++ b/blockchain/chain_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrutil/v3" diff --git a/blockchain/chaingen/example_test.go b/blockchain/chaingen/example_test.go index e76eed10..25f7e194 100644 --- a/blockchain/chaingen/example_test.go +++ b/blockchain/chaingen/example_test.go @@ -7,7 +7,7 @@ package chaingen_test import ( "fmt" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/v3" ) diff --git a/blockchain/common_test.go b/blockchain/common_test.go index 6b1c6a15..44a96da3 100644 --- a/blockchain/common_test.go +++ b/blockchain/common_test.go @@ -19,7 +19,7 @@ import ( "time" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/blockchain/example_test.go b/blockchain/example_test.go index fafedf6b..982d0f9f 100644 --- a/blockchain/example_test.go +++ b/blockchain/example_test.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" _ "github.com/decred/dcrd/database/v2/ffldb" diff --git a/blockchain/fullblocks_test.go b/blockchain/fullblocks_test.go index 105e01d0..6ea7acc3 100644 --- a/blockchain/fullblocks_test.go +++ b/blockchain/fullblocks_test.go @@ -14,8 +14,8 @@ import ( "os" "testing" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/fullblocktests" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/fullblocktests" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/blockchain/fullblocksstakeversion_test.go b/blockchain/fullblocksstakeversion_test.go index 27096238..c5157abc 100644 --- a/blockchain/fullblocksstakeversion_test.go +++ b/blockchain/fullblocksstakeversion_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/v3" ) diff --git a/blockchain/fullblocktests/generate.go b/blockchain/fullblocktests/generate.go index 88ad3819..1e292d85 100644 --- a/blockchain/fullblocktests/generate.go +++ b/blockchain/fullblocktests/generate.go @@ -13,8 +13,8 @@ import ( "math" "time" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/secp256k1/v3" diff --git a/blockchain/go.mod b/blockchain/go.mod index d7a93735..b3a7cb47 100644 --- a/blockchain/go.mod +++ b/blockchain/go.mod @@ -1,4 +1,4 @@ -module github.com/decred/dcrd/blockchain/v3 +module github.com/decred/dcrd/blockchain/v4 go 1.13 diff --git a/blockchain/indexers/manager.go b/blockchain/indexers/manager.go index 6bc491fd..659f15b9 100644 --- a/blockchain/indexers/manager.go +++ b/blockchain/indexers/manager.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - "github.com/decred/dcrd/blockchain/v3/internal/progresslog" + "github.com/decred/dcrd/blockchain/v4/internal/progresslog" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/blockchain/process_test.go b/blockchain/process_test.go index ef00946b..1b131b0f 100644 --- a/blockchain/process_test.go +++ b/blockchain/process_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/wire" diff --git a/blockchain/thresholdstate_test.go b/blockchain/thresholdstate_test.go index 817a84df..b5c9fcf9 100644 --- a/blockchain/thresholdstate_test.go +++ b/blockchain/thresholdstate_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/v3" ) diff --git a/blockchain/treasury_test.go b/blockchain/treasury_test.go index 9615fc46..9098d33f 100644 --- a/blockchain/treasury_test.go +++ b/blockchain/treasury_test.go @@ -17,7 +17,7 @@ import ( "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/blockchain/utxoviewpoint_test.go b/blockchain/utxoviewpoint_test.go index 97351311..9aa8d6b4 100644 --- a/blockchain/utxoviewpoint_test.go +++ b/blockchain/utxoviewpoint_test.go @@ -7,7 +7,7 @@ package blockchain import ( "testing" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/wire" diff --git a/blockchain/validate_test.go b/blockchain/validate_test.go index bb853ede..8be6ccc4 100644 --- a/blockchain/validate_test.go +++ b/blockchain/validate_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/blockmanager.go b/blockmanager.go index 469b0cca..2e8a771a 100644 --- a/blockmanager.go +++ b/blockmanager.go @@ -17,7 +17,7 @@ import ( "time" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/cmd/addblock/addblock.go b/cmd/addblock/addblock.go index f78ed230..a22a43c6 100644 --- a/cmd/addblock/addblock.go +++ b/cmd/addblock/addblock.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/database/v2" "github.com/decred/dcrd/internal/limits" "github.com/decred/slog" diff --git a/cmd/addblock/import.go b/cmd/addblock/import.go index 74ac43ab..72dfc4ea 100644 --- a/cmd/addblock/import.go +++ b/cmd/addblock/import.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/database/v2" "github.com/decred/dcrd/dcrutil/v3" diff --git a/cmd/findcheckpoint/findcheckpoint.go b/cmd/findcheckpoint/findcheckpoint.go index 0ef12bcc..63eb56c9 100644 --- a/cmd/findcheckpoint/findcheckpoint.go +++ b/cmd/findcheckpoint/findcheckpoint.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/dcrd.go b/dcrd.go index a4952cc7..5ab68860 100644 --- a/dcrd.go +++ b/dcrd.go @@ -17,7 +17,7 @@ import ( "runtime/pprof" "strings" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/internal/limits" "github.com/decred/dcrd/internal/version" ) diff --git a/go.mod b/go.mod index fd4a6eb3..8cd083d9 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/decred/dcrd/bech32 v1.1.1 github.com/decred/dcrd/blockchain/stake/v3 v3.0.0 github.com/decred/dcrd/blockchain/standalone/v2 v2.0.0 - github.com/decred/dcrd/blockchain/v3 v3.0.0 + github.com/decred/dcrd/blockchain/v4 v4.0.0 github.com/decred/dcrd/certgen v1.1.1 github.com/decred/dcrd/chaincfg/chainhash v1.0.2 github.com/decred/dcrd/chaincfg/v3 v3.0.0 @@ -45,7 +45,7 @@ replace ( github.com/decred/dcrd/bech32 => ./bech32 github.com/decred/dcrd/blockchain/stake/v3 => ./blockchain/stake github.com/decred/dcrd/blockchain/standalone/v2 => ./blockchain/standalone - github.com/decred/dcrd/blockchain/v3 => ./blockchain + github.com/decred/dcrd/blockchain/v4 => ./blockchain github.com/decred/dcrd/certgen => ./certgen github.com/decred/dcrd/chaincfg/chainhash => ./chaincfg/chainhash github.com/decred/dcrd/chaincfg/v3 => ./chaincfg diff --git a/internal/mempool/error.go b/internal/mempool/error.go index 11186eab..7626df50 100644 --- a/internal/mempool/error.go +++ b/internal/mempool/error.go @@ -9,7 +9,7 @@ import ( "errors" "fmt" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" ) // ErrorKind identifies a kind of error. It has full support for errors.Is and diff --git a/internal/mempool/mempool.go b/internal/mempool/mempool.go index 76c4dd13..7f27aec1 100644 --- a/internal/mempool/mempool.go +++ b/internal/mempool/mempool.go @@ -15,8 +15,8 @@ import ( "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrutil/v3" diff --git a/internal/mempool/mempool_test.go b/internal/mempool/mempool_test.go index 500d6b03..d834b0ad 100644 --- a/internal/mempool/mempool_test.go +++ b/internal/mempool/mempool_test.go @@ -18,8 +18,8 @@ import ( "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/chaingen" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/chaingen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrec" diff --git a/internal/mempool/policy.go b/internal/mempool/policy.go index 65cd8870..aa67a7f1 100644 --- a/internal/mempool/policy.go +++ b/internal/mempool/policy.go @@ -10,7 +10,7 @@ import ( "time" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/txscript/v3" "github.com/decred/dcrd/wire" diff --git a/internal/mining/bgblktmplgenerator.go b/internal/mining/bgblktmplgenerator.go index 19656ad3..cebf9073 100644 --- a/internal/mining/bgblktmplgenerator.go +++ b/internal/mining/bgblktmplgenerator.go @@ -13,7 +13,7 @@ import ( "time" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/lru" diff --git a/internal/mining/cpuminer/cpuminer.go b/internal/mining/cpuminer/cpuminer.go index 9a251f7e..232db13a 100644 --- a/internal/mining/cpuminer/cpuminer.go +++ b/internal/mining/cpuminer/cpuminer.go @@ -15,7 +15,7 @@ import ( "time" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrutil/v3" diff --git a/internal/mining/mining.go b/internal/mining/mining.go index f1637acf..62264134 100644 --- a/internal/mining/mining.go +++ b/internal/mining/mining.go @@ -15,7 +15,7 @@ import ( "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrutil/v3" diff --git a/internal/rpcserver/interface.go b/internal/rpcserver/interface.go index ee71a0fe..c038e485 100644 --- a/internal/rpcserver/interface.go +++ b/internal/rpcserver/interface.go @@ -12,8 +12,8 @@ import ( "github.com/decred/dcrd/addrmgr" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/database/v2" "github.com/decred/dcrd/dcrutil/v3" diff --git a/internal/rpcserver/rpcserver.go b/internal/rpcserver/rpcserver.go index 668ebb2b..74826e51 100644 --- a/internal/rpcserver/rpcserver.go +++ b/internal/rpcserver/rpcserver.go @@ -35,7 +35,7 @@ import ( "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/internal/rpcserver/rpcserverhandlers_test.go b/internal/rpcserver/rpcserverhandlers_test.go index 8442714a..3af66474 100644 --- a/internal/rpcserver/rpcserverhandlers_test.go +++ b/internal/rpcserver/rpcserverhandlers_test.go @@ -27,8 +27,8 @@ import ( "github.com/decred/dcrd/addrmgr" "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/database/v2" diff --git a/internal/rpcserver/rpcwebsocket.go b/internal/rpcserver/rpcwebsocket.go index 324685bb..efc372db 100644 --- a/internal/rpcserver/rpcwebsocket.go +++ b/internal/rpcserver/rpcwebsocket.go @@ -24,7 +24,7 @@ import ( "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/crypto/ripemd160" diff --git a/log.go b/log.go index efa06165..28843d36 100644 --- a/log.go +++ b/log.go @@ -12,8 +12,8 @@ import ( "github.com/decred/dcrd/addrmgr" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/connmgr/v3" "github.com/decred/dcrd/database/v2" "github.com/decred/dcrd/internal/fees" diff --git a/rpcadaptors.go b/rpcadaptors.go index f383894b..b381fd0d 100644 --- a/rpcadaptors.go +++ b/rpcadaptors.go @@ -12,7 +12,7 @@ import ( "time" "github.com/decred/dcrd/blockchain/stake/v3" - "github.com/decred/dcrd/blockchain/v3" + "github.com/decred/dcrd/blockchain/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/dcrutil/v3" diff --git a/server.go b/server.go index 5ca53c03..0e4ed02d 100644 --- a/server.go +++ b/server.go @@ -28,8 +28,8 @@ import ( "github.com/decred/dcrd/addrmgr" "github.com/decred/dcrd/blockchain/stake/v3" "github.com/decred/dcrd/blockchain/standalone/v2" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/blockchain/v3/indexers" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/blockchain/v4/indexers" "github.com/decred/dcrd/certgen" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3"