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

Move mempool nullptr Assert out of LoadChainstate

Browse Source
This commit is contained in:
Carl Dong
2021-11-11 19:19:09 -05:00
parent 9162a4f93e
commit 8715658983
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -1421,7 +1421,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
const int64_t load_block_index_start_time = GetTimeMillis(); const int64_t load_block_index_start_time = GetTimeMillis();
auto rv = LoadChainstate(fReset, auto rv = LoadChainstate(fReset,
chainman, chainman,
node.mempool.get(), Assert(node.mempool.get()),
fPruneMode, fPruneMode,
chainparams, chainparams,
fReindexChainState, fReindexChainState,

2
src/node/chainstate.cpp
View File

@@ -31,7 +31,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
do { do {
try { try {
LOCK(cs_main); LOCK(cs_main);
chainman.InitializeChainstate(Assert(mempool)); chainman.InitializeChainstate(mempool);
chainman.m_total_coinstip_cache = nCoinCacheUsage; chainman.m_total_coinstip_cache = nCoinCacheUsage;
chainman.m_total_coinsdb_cache = nCoinDBCache; chainman.m_total_coinsdb_cache = nCoinDBCache;