diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-02-21 10:41:08 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-02-21 10:29:37 +0100 |
| commit | fa462ea787d124c56d6ba7ef79a9b5b23f0411c5 (patch) | |
| tree | 8a4dd586d074ea6adf38280283ee4187ebd6644a | |
| parent | cf22191fd8cf7fae22e561e14b3a68e49e39b15c (diff) | |
| download | bitcoin-fa462ea787d124c56d6ba7ef79a9b5b23f0411c5.tar.xz | |
Avoid implicit-integer-sign-change in VerifyLoadedChainstate
| -rw-r--r-- | src/node/chainstate.cpp | 4 | ||||
| -rw-r--r-- | src/node/chainstate.h | 4 | ||||
| -rwxr-xr-x | test/functional/rpc_blockchain.py | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp index e21116dd7e..d03b9dcac6 100644 --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -129,8 +129,8 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage bool fReset, bool fReindexChainState, const Consensus::Params& consensus_params, - unsigned int check_blocks, - unsigned int check_level, + int check_blocks, + int check_level, std::function<int64_t()> get_unix_time_seconds) { auto is_coinsview_empty = [&](CChainState* chainstate) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { diff --git a/src/node/chainstate.h b/src/node/chainstate.h index 279f187642..8ba04f1436 100644 --- a/src/node/chainstate.h +++ b/src/node/chainstate.h @@ -79,8 +79,8 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage bool fReset, bool fReindexChainState, const Consensus::Params& consensus_params, - unsigned int check_blocks, - unsigned int check_level, + int check_blocks, + int check_level, std::function<int64_t()> get_unix_time_seconds); } // namespace node diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 2d96ba74b5..b264f23fb5 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -69,7 +69,14 @@ class BlockchainTest(BitcoinTestFramework): self.wallet = MiniWallet(self.nodes[0]) self.mine_chain() self._test_max_future_block_time() - self.restart_node(0, extra_args=['-stopatheight=207', '-prune=1']) # Set extra args with pruning after rescan is complete + self.restart_node( + 0, + extra_args=[ + "-stopatheight=207", + "-checkblocks=-1", # Check all blocks + "-prune=1", # Set pruning after rescan is complete + ], + ) self._test_getblockchaininfo() self._test_getchaintxstats() |