From fa462ea787d124c56d6ba7ef79a9b5b23f0411c5 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 21 Feb 2022 10:41:08 +0100 Subject: [PATCH] Avoid implicit-integer-sign-change in VerifyLoadedChainstate --- src/node/chainstate.cpp | 4 ++-- src/node/chainstate.h | 4 ++-- 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 e21116dd7ef..d03b9dcac69 100644 --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -129,8 +129,8 @@ std::optional 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 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 279f1876428..8ba04f1436f 100644 --- a/src/node/chainstate.h +++ b/src/node/chainstate.h @@ -79,8 +79,8 @@ std::optional 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 get_unix_time_seconds); } // namespace node diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 2d96ba74b5f..b264f23fb5e 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()