Move mempool nullptr Assert out of LoadChainstate

dashpay · Dec 16, 2024 · 29c7362 · 29c7362
1 parent 7071282
commit 29c7362
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1881,7 +1881,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                                  llmq::quorumInstantSendManager,
                                  llmq::quorumSnapshotManager,
                                  node.llmq_ctx,
-                                 node.mempool.get(),
+                                 Assert(node.mempool.get()),
                                  fPruneMode,
                                  args.GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX),
                                  is_governance_enabled,

diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
@@ -69,7 +69,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
             mnhf_manager.reset();
             mnhf_manager = std::make_unique<CMNHFManager>(*evodb);
 
-            chainman.InitializeChainstate(Assert(mempool), *evodb, chain_helper, clhandler, isman);
+            chainman.InitializeChainstate(mempool, *evodb, chain_helper, clhandler, isman);
             chainman.m_total_coinstip_cache = nCoinCacheUsage;
             chainman.m_total_coinsdb_cache = nCoinDBCache;