mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge d4b5553849 into merged_master (Bitcoin PR bitcoin/bitcoin#30742)
This commit is contained in:
commit
b28b274b1b
9 changed files with 19 additions and 16 deletions
|
|
@ -1305,7 +1305,7 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
void ImportBlocks(ChainstateManager& chainman, std::vector<fs::path> vImportFiles)
|
||||
void ImportBlocks(ChainstateManager& chainman, std::span<const fs::path> import_paths)
|
||||
{
|
||||
ImportingNow imp{chainman.m_blockman.m_importing};
|
||||
|
||||
|
|
@ -1340,7 +1340,7 @@ void ImportBlocks(ChainstateManager& chainman, std::vector<fs::path> vImportFile
|
|||
}
|
||||
|
||||
// -loadblock=
|
||||
for (const fs::path& path : vImportFiles) {
|
||||
for (const fs::path& path : import_paths) {
|
||||
AutoFile file{fsbridge::fopen(path, "rb")};
|
||||
if (!file.IsNull()) {
|
||||
LogPrintf("Importing blocks file %s...\n", fs::PathToString(path));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue