diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-09-22 11:32:25 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-15 09:22:04 +0000 |
| commit | db76db7329f6357c5226cd08611fe0f669c002af (patch) | |
| tree | 4603761b67be87ca0f61fdbfb7de994784c8b288 | |
| parent | 85c78e08ec857e51a9748d1a2492d1d3794b221a (diff) | |
| download | bitcoin-db76db7329f6357c5226cd08611fe0f669c002af.tar.xz | |
Fix (inverse) meaning of -persistmempool
Github-Pull: #23061
Rebased-From: faff17bbde6dcb1482a6210bc48b3192603a446f
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/validation.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/mempool_persist.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 9afd76d62d..7b13296f7c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -217,7 +217,7 @@ void Shutdown(NodeContext& node) node.banman.reset(); node.addrman.reset(); - if (node.mempool && node.mempool->IsLoaded() && node.args->GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { + if (node.mempool && node.mempool->IsLoaded() && node.args->GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { DumpMempool(*node.mempool); } diff --git a/src/validation.cpp b/src/validation.cpp index 26333d7026..e060899ea0 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3822,7 +3822,7 @@ bool CChainState::LoadBlockIndexDB() void CChainState::LoadMempool(const ArgsManager& args) { if (!m_mempool) return; - if (args.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { + if (args.GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { ::LoadMempool(*m_mempool, *this); } m_mempool->SetIsLoaded(!ShutdownRequested()); diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py index 752b925b92..1ae95fced3 100755 --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -141,7 +141,7 @@ class MempoolPersistTest(BitcoinTestFramework): self.log.debug("Stop nodes, make node1 use mempool.dat from node0. Verify it has 6 transactions") os.rename(mempooldat0, mempooldat1) self.stop_nodes() - self.start_node(1, extra_args=[]) + self.start_node(1, extra_args=["-persistmempool"]) assert self.nodes[1].getmempoolinfo()["loaded"] assert_equal(len(self.nodes[1].getrawmempool()), 6) |