Page MenuHomePhabricator
Files F14864876

D17744.id52919.diff
No OneTemporary
Actions

D17744.id52919.diff
View Options

diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2759,9 +2759,11 @@
avalanche::Processor *const avalanche = node.avalanche.get();
chainman.m_load_block =
std::thread(&util::TraceThread, "loadblk", [=, &chainman, &args] {
- ThreadImport(chainman, avalanche, vImportFiles,
- ShouldPersistMempool(args) ? MempoolPath(args)
- : fs::path{});
+ // Import blocks
+ ThreadImport(chainman, avalanche, vImportFiles);
+ // Load mempool from disk
+ chainman.ActiveChainstate().LoadMempool(
+ ShouldPersistMempool(args) ? MempoolPath(args) : fs::path{});
});
// Wait for genesis block to be processed
diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h
--- a/src/node/blockstorage.h
+++ b/src/node/blockstorage.h
@@ -311,8 +311,7 @@
void ThreadImport(ChainstateManager &chainman,
avalanche::Processor *const avalanche,
- std::vector<fs::path> vImportFiles,
- const fs::path &mempool_path);
+ std::vector<fs::path> vImportFiles);
} // namespace node
#endif // BITCOIN_NODE_BLOCKSTORAGE_H
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
--- a/src/node/blockstorage.cpp
+++ b/src/node/blockstorage.cpp
@@ -918,8 +918,7 @@
void ThreadImport(ChainstateManager &chainman,
avalanche::Processor *const avalanche,
- std::vector<fs::path> vImportFiles,
- const fs::path &mempool_path) {
+ std::vector<fs::path> vImportFiles) {
ScheduleBatchPriority();
{
@@ -1030,7 +1029,7 @@
return;
}
} // End scope of ImportingNow
- chainman.ActiveChainstate().LoadMempool(mempool_path);
+
g_indexes_ready_to_sync = true;
}
} // namespace node

File Metadata

Mime Type
text/plain
Expires
Tue, May 20, 22:57 (4 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5866110
Default Alt Text
D17744.id52919.diff (1 KB)

Event Timeline