GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge e253568da8 into merged_master (Bitcoin PR bitcoin/bitcoin#28053)

Browse source
This commit is contained in:
Byron Hambly 2025-07-01 11:52:36 +02:00
commit 61ecd1fa45
5 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/node/blockmanager_args.cpp
View file

@ -32,7 +32,6 @@ util::Result<void> ApplyArgsManOptions(const ArgsManager& args, BlockManager::Op
opts.prune_target = nPruneTarget;
if (auto value{args.GetBoolArg("-fastprune")}) opts.fast_prune = *value;
if (auto value{args.GetBoolArg("-stopafterblockimport")}) opts.stop_after_block_import = *value;
return {};
}

6
src/node/blockstorage.cpp
View file

@ -958,12 +958,6 @@ void ImportBlocks(ChainstateManager& chainman, std::vector<fs::path> vImportFile
return;
}
}
if (chainman.m_blockman.StopAfterBlockImport()) {
LogPrintf("Stopping after block import\n");
StartShutdown();
return;
}
} // End scope of ImportingNow
}
} // namespace node

2
src/node/blockstorage.h
View file

@ -223,8 +223,6 @@ public:
[[nodiscard]] bool LoadingBlocks() const { return m_importing || fReindex; }
[[nodiscard]] bool StopAfterBlockImport() const { return m_opts.stop_after_block_import; }
/** Calculate the amount of disk space the block & undo files currently use */
uint64_t CalculateCurrentUsage();