From 29c736280dd0034b093187fa8fe796d743efceb0 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 14 Dec 2024 17:10:01 +0000
Subject: [PATCH] Move mempool nullptr Assert out of LoadChainstate

---
 src/init.cpp            | 2 +-
 src/node/chainstate.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 88d9221451..bd9fa4e499 100644
--- 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
index 49894e42eb..96652513a9 100644
--- 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;