From faa5c86dbfec1ed7bdcd6a07316315147a7e87a2 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Mon, 22 Jul 2024 12:26:24 +0200 Subject: [PATCH] refactor: Use untranslated error message in ActivateSnapshot 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 --- src/validation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index b90fe48ca5b..b290efc34f1 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -5681,7 +5681,7 @@ util::Result ChainstateManager::ActivateSnapshot( } 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()}; @@ -5735,7 +5735,7 @@ util::Result ChainstateManager::ActivateSnapshot( static_cast(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(); // PopulateAndValidateSnapshot can return (in error) before the leveldb datadir