Merge 08785aa75b into merged_master (Bitcoin PR bitcoin/bitcoin#25499)

This commit is contained in:
Byron Hambly 2024-11-27 10:47:04 +02:00
commit 09e2cad10f
8 changed files with 18 additions and 20 deletions

View file

@ -4789,7 +4789,7 @@ void Chainstate::LoadExternalBlockFile(
// Either both should be specified (-reindex), or neither (-loadblock).
assert(!dbp == !blocks_with_unknown_parent);
int64_t nStart = GetTimeMillis();
const auto start{SteadyClock::now()};
int nLoaded = 0;
try {
@ -4903,7 +4903,7 @@ void Chainstate::LoadExternalBlockFile(
} catch (const std::runtime_error& e) {
AbortNode(std::string("System error: ") + e.what());
}
LogPrintf("Loaded %i blocks from external file in %dms\n", nLoaded, GetTimeMillis() - nStart);
LogPrintf("Loaded %i blocks from external file in %dms\n", nLoaded, Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
}
void Chainstate::CheckBlockIndex()