validation: Use *this in CChainState::LoadMempool

dongcarl · dongcarl · commit 8c824819c850 · 2021-02-18T14:49:10.000-05:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4185,7 +4185,8 @@ bool static LoadBlockIndexDB(ChainstateManager& chainman, const CChainParams& ch
 void CChainState::LoadMempool(const ArgsManager& args)
 {
     if (args.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
-        ::LoadMempool(m_mempool, ::ChainstateActive());
+        assert(std::addressof(::ChainstateActive()) == std::addressof(*this));
+        ::LoadMempool(m_mempool, *this);
     }
     m_mempool.SetIsLoaded(!ShutdownRequested());
 }

Original file line number	Diff line number	Diff line change
`@@ -4185,7 +4185,8 @@ bool static LoadBlockIndexDB(ChainstateManager& chainman, const CChainParams& ch`
`4185`	`4185`	`void CChainState::LoadMempool(const ArgsManager& args)`
`4186`	`4186`	`{`
`4187`	`4187`	`if (args.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {`
`4188`		`- ::LoadMempool(m_mempool, ::ChainstateActive());`
	`4188`	`+ assert(std::addressof(::ChainstateActive()) == std::addressof(*this));`
	`4189`	`+ ::LoadMempool(m_mempool, *this);`
`4189`	`4190`	`}`
`4190`	`4191`	`m_mempool.SetIsLoaded(!ShutdownRequested());`
`4191`	`4192`	`}`