highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-05 17:30:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Use untranslated error message in ActivateSnapshot

Browse Source 
The message is not exposed in the GUI or another translated context, so
translating it is useless for now.

Also, fix a nit from https://github.com/bitcoin/bitcoin/pull/30395#discussion_r1670972864
This commit is contained in:
MarcoFalke 2024-07-22 12:26:24 +02:00
parent 955f173b4b
commit faa5c86dbf
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/validation.cpp
View File

@ -5681,7 +5681,7 @@ util::Result<void> ChainstateManager::ActivateSnapshot(
} }
if (!m_best_header || m_best_header->GetAncestor(base_blockheight) != snapshot_start_block) { if (!m_best_header || m_best_header->GetAncestor(base_blockheight) != snapshot_start_block) {
return util::Error{_("A forked headers-chain with more work than the chain with the snapshot base block header exists. Please proceed to sync without AssumeUtxo.")}; return util::Error{Untranslated("A forked headers-chain with more work than the chain with the snapshot base block header exists. Please proceed to sync without AssumeUtxo.")};
} }
auto mempool{m_active_chainstate->GetMempool()}; auto mempool{m_active_chainstate->GetMempool()};
@ -5735,7 +5735,7 @@ util::Result<void> ChainstateManager::ActivateSnapshot(
static_cast<size_t>(current_coinstip_cache_size * SNAPSHOT_CACHE_PERC)); static_cast<size_t>(current_coinstip_cache_size * SNAPSHOT_CACHE_PERC));
} }
auto cleanup_bad_snapshot = [&](bilingual_str&& reason) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { auto cleanup_bad_snapshot = [&](bilingual_str reason) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
this->MaybeRebalanceCaches(); this->MaybeRebalanceCaches();
// PopulateAndValidateSnapshot can return (in error) before the leveldb datadir // PopulateAndValidateSnapshot can return (in error) before the leveldb datadir