Skip to content

Commit faa5c86

Browse files
author
MarcoFalke
committed
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 bitcoin/bitcoin#30395 (comment)
1 parent 955f173 commit faa5c86

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/validation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5681,7 +5681,7 @@ util::Result<void> ChainstateManager::ActivateSnapshot(
56815681
}
56825682

56835683
if (!m_best_header || m_best_header->GetAncestor(base_blockheight) != snapshot_start_block) {
5684-
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.")};
5684+
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.")};
56855685
}
56865686

56875687
auto mempool{m_active_chainstate->GetMempool()};
@@ -5735,7 +5735,7 @@ util::Result<void> ChainstateManager::ActivateSnapshot(
57355735
static_cast<size_t>(current_coinstip_cache_size * SNAPSHOT_CACHE_PERC));
57365736
}
57375737

5738-
auto cleanup_bad_snapshot = [&](bilingual_str&& reason) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
5738+
auto cleanup_bad_snapshot = [&](bilingual_str reason) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
57395739
this->MaybeRebalanceCaches();
57405740

57415741
// PopulateAndValidateSnapshot can return (in error) before the leveldb datadir

0 commit comments

Comments
 (0)