diff options
| author | Carl Dong <contact@carldong.me> | 2022-07-12 21:42:00 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2022-07-15 12:26:20 -0400 |
| commit | 06b88ffb8ae7f2b2a93a32908cd80e77fafd270c (patch) | |
| tree | 3900f5448c90bf9a3f9f9de58aa9cac203e68589 /src/init.cpp | |
| parent | b857ac60d9a0433036519c26675378bbf56a1de1 (diff) | |
| download | bitcoin-06b88ffb8ae7f2b2a93a32908cd80e77fafd270c.tar.xz | |
LoadMempool: Pass in load_path, stop using gArgs
Also:
1. Have CChainState::LoadMempool and ::ThreadImport take in paths and
pass it through untouched to LoadMempool.
2. Make LoadMempool exit early if the load_path is empty.
3. Adjust the call to ::ThreadImport in ::AppInitMain to correctly pass
in an empty path if mempool persistence is disabled.
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 62eff218cb..542b6f105f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1673,7 +1673,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) } chainman.m_load_block = std::thread(&util::TraceThread, "loadblk", [=, &chainman, &args] { - ThreadImport(chainman, vImportFiles, args); + ThreadImport(chainman, vImportFiles, args, ShouldPersistMempool(args) ? MempoolPath(args) : fs::path{}); }); // Wait for genesis block to be processed |