highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not pass Consensus::Params& to Chainstate helpers

Browse Source
This commit is contained in:
MacroFake
2022-05-18 18:49:36 +02:00
parent fa4ee53dca
commit faf012b438
5 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitcoin-chainstate.cpp
View File

@@ -76,7 +76,6 @@ int main(int argc, char* argv[])
std::ref(chainman), std::ref(chainman),
nullptr, nullptr,
false, false,
chainparams.GetConsensus(),
false, false,
2 << 20, 2 << 20,
2 << 22, 2 << 22,
@@ -91,7 +90,6 @@ int main(int argc, char* argv[])
auto maybe_verify_error = node::VerifyLoadedChainstate(std::ref(chainman), auto maybe_verify_error = node::VerifyLoadedChainstate(std::ref(chainman),
false, false,
false, false,
chainparams.GetConsensus(),
DEFAULT_CHECKBLOCKS, DEFAULT_CHECKBLOCKS,
DEFAULT_CHECKLEVEL); DEFAULT_CHECKLEVEL);
if (maybe_verify_error.has_value()) { if (maybe_verify_error.has_value()) {

4
src/init.cpp
View File

@@ -1438,7 +1438,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
chainman, chainman,
Assert(node.mempool.get()), Assert(node.mempool.get()),
fPruneMode, fPruneMode,
chainparams.GetConsensus(),
fReindexChainState, fReindexChainState,
cache_sizes.block_tree_db, cache_sizes.block_tree_db,
cache_sizes.coins_db, cache_sizes.coins_db,
@@ -1485,7 +1484,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
break; break;
case ChainstateLoadingError::ERROR_BLOCKS_WITNESS_INSUFFICIENTLY_VALIDATED: case ChainstateLoadingError::ERROR_BLOCKS_WITNESS_INSUFFICIENTLY_VALIDATED:
strLoadError = strprintf(_("Witness data for blocks after height %d requires validation. Please restart with -reindex."), strLoadError = strprintf(_("Witness data for blocks after height %d requires validation. Please restart with -reindex."),
chainparams.GetConsensus().SegwitHeight); chainman.GetConsensus().SegwitHeight);
break; break;
case ChainstateLoadingError::SHUTDOWN_PROBED: case ChainstateLoadingError::SHUTDOWN_PROBED:
break; break;
@@ -1502,7 +1501,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
maybe_verify_error = VerifyLoadedChainstate(chainman, maybe_verify_error = VerifyLoadedChainstate(chainman,
fReset, fReset,
fReindexChainState, fReindexChainState,
chainparams.GetConsensus(),
check_blocks, check_blocks,
args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL)); args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL));
} catch (const std::exception& e) { } catch (const std::exception& e) {

6
src/node/chainstate.cpp
View File

@@ -13,7 +13,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
ChainstateManager& chainman, ChainstateManager& chainman,
CTxMemPool* mempool, CTxMemPool* mempool,
bool fPruneMode, bool fPruneMode,
const Consensus::Params& consensus_params,
bool fReindexChainState, bool fReindexChainState,
int64_t nBlockTreeDBCache, int64_t nBlockTreeDBCache,
int64_t nCoinDBCache, int64_t nCoinDBCache,
@@ -57,7 +56,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
} }
if (!chainman.BlockIndex().empty() && if (!chainman.BlockIndex().empty() &&
!chainman.m_blockman.LookupBlockIndex(consensus_params.hashGenesisBlock)) { !chainman.m_blockman.LookupBlockIndex(chainman.GetConsensus().hashGenesisBlock)) {
return ChainstateLoadingError::ERROR_BAD_GENESIS_BLOCK; return ChainstateLoadingError::ERROR_BAD_GENESIS_BLOCK;
} }
@@ -126,7 +125,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManager& chainman, std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManager& chainman,
bool fReset, bool fReset,
bool fReindexChainState, bool fReindexChainState,
const Consensus::Params& consensus_params,
int check_blocks, int check_blocks,
int check_level) int check_level)
{ {
@@ -144,7 +142,7 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
} }
if (!CVerifyDB().VerifyDB( if (!CVerifyDB().VerifyDB(
*chainstate, consensus_params, chainstate->CoinsDB(), *chainstate, chainman.GetConsensus(), chainstate->CoinsDB(),
check_level, check_level,
check_blocks)) { check_blocks)) {
return ChainstateLoadVerifyError::ERROR_CORRUPTED_BLOCK_DB; return ChainstateLoadVerifyError::ERROR_CORRUPTED_BLOCK_DB;

2
src/node/chainstate.h
View File

@@ -59,7 +59,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
ChainstateManager& chainman, ChainstateManager& chainman,
CTxMemPool* mempool, CTxMemPool* mempool,
bool fPruneMode, bool fPruneMode,
const Consensus::Params& consensus_params,
bool fReindexChainState, bool fReindexChainState,
int64_t nBlockTreeDBCache, int64_t nBlockTreeDBCache,
int64_t nCoinDBCache, int64_t nCoinDBCache,
@@ -78,7 +77,6 @@ enum class ChainstateLoadVerifyError {
std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManager& chainman, std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManager& chainman,
bool fReset, bool fReset,
bool fReindexChainState, bool fReindexChainState,
const Consensus::Params& consensus_params,
int check_blocks, int check_blocks,
int check_level); int check_level);
} // namespace node } // namespace node

2
src/test/util/setup_common.cpp
View File

@@ -201,7 +201,6 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
*Assert(m_node.chainman.get()), *Assert(m_node.chainman.get()),
Assert(m_node.mempool.get()), Assert(m_node.mempool.get()),
fPruneMode, fPruneMode,
chainparams.GetConsensus(),
m_args.GetBoolArg("-reindex-chainstate", false), m_args.GetBoolArg("-reindex-chainstate", false),
m_cache_sizes.block_tree_db, m_cache_sizes.block_tree_db,
m_cache_sizes.coins_db, m_cache_sizes.coins_db,
@@ -214,7 +213,6 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
*Assert(m_node.chainman), *Assert(m_node.chainman),
fReindex.load(), fReindex.load(),
m_args.GetBoolArg("-reindex-chainstate", false), m_args.GetBoolArg("-reindex-chainstate", false),
chainparams.GetConsensus(),
m_args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS), m_args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS),
m_args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL)); m_args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL));
assert(!maybe_verify_error.has_value()); assert(!maybe_verify_error.has_value());