Skip to content

Commit 8715658

Browse files
committed
Move mempool nullptr Assert out of LoadChainstate
1 parent 9162a4f commit 8715658

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
14211421
const int64_t load_block_index_start_time = GetTimeMillis();
14221422
auto rv = LoadChainstate(fReset,
14231423
chainman,
1424-
node.mempool.get(),
1424+
Assert(node.mempool.get()),
14251425
fPruneMode,
14261426
chainparams,
14271427
fReindexChainState,

src/node/chainstate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
3131
do {
3232
try {
3333
LOCK(cs_main);
34-
chainman.InitializeChainstate(Assert(mempool));
34+
chainman.InitializeChainstate(mempool);
3535
chainman.m_total_coinstip_cache = nCoinCacheUsage;
3636
chainman.m_total_coinsdb_cache = nCoinDBCache;
3737

0 commit comments

Comments
 (0)