mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

Avoid implicit-integer-sign-change in VerifyLoadedChainstate

Browse source
This commit is contained in:
MarcoFalke 2022-02-21 10:41:08 +01:00
parent cf22191fd8
commit fa462ea787
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/node/chainstate.cpp
View file

@ -129,8 +129,8 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
bool fReset, bool fReset,
bool fReindexChainState, bool fReindexChainState,
const Consensus::Params& consensus_params, const Consensus::Params& consensus_params,
unsigned int check_blocks, int check_blocks,
unsigned int check_level, int check_level,
std::function<int64_t()> get_unix_time_seconds) std::function<int64_t()> get_unix_time_seconds)
{ {
auto is_coinsview_empty = [&](CChainState* chainstate) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { auto is_coinsview_empty = [&](CChainState* chainstate) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {

4
src/node/chainstate.h
View file

@ -79,8 +79,8 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
bool fReset, bool fReset,
bool fReindexChainState, bool fReindexChainState,
const Consensus::Params& consensus_params, const Consensus::Params& consensus_params,
unsigned int check_blocks, int check_blocks,
unsigned int check_level, int check_level,
std::function<int64_t()> get_unix_time_seconds); std::function<int64_t()> get_unix_time_seconds);
} // namespace node } // namespace node

9
test/functional/rpc_blockchain.py
View file

@ -69,7 +69,14 @@ class BlockchainTest(BitcoinTestFramework):
self.wallet = MiniWallet(self.nodes[0]) self.wallet = MiniWallet(self.nodes[0])
self.mine_chain() self.mine_chain()
self._test_max_future_block_time() 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_getblockchaininfo()
self._test_getchaintxstats() self._test_getchaintxstats()