Motivation:
Also, while touching this:
\n. See #30267 (review)
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For detailed information about the code coverage, see the test coverage report.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | tdb3, fjahr, ryanofsky |
| Concept ACK | TheCharlatan |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the documentation.
Possibly this is due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.
Leave a comment here, if you need help tracking down a confusing failure.
2832@@ -2833,7 +2833,7 @@ static RPCHelpMan loadtxoutset()
2833
2834 auto activation_result{chainman.ActivateSnapshot(afile, metadata, false)};
2835 if (!activation_result) {
2836- throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf(_("Unable to load UTXO snapshot: %s\n"), util::ErrorString(activation_result)).original);
2837+ throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Unable to load UTXO snapshot: %s. (%s)", util::ErrorString(activation_result).original, path.utf8string()));
nit: It looks like there might be an extraneous period for at least some error messages (between the error message and the parenthesis-wrapped path).
Created a snapshot with dumptxoutset.
Modified a byte in the snapshot to induce failure during load.
0$ src/bitcoin-cli loadtxoutset mytxoutset.dat
1error code: -32603
2error message:
3Unable to load UTXO snapshot: assumeutxo block hash in snapshot metadata not recognized (hash: 767fccc851802c0180a3ebf1631ab978d4d6a5ae1d452dc26e9c177850708e6c, height: 101). The following snapshot heights are available: 110, 299.. (/home/dev/.bitcoin/regtest/mytxoutset.dat)
..
ACK fa5b8920be041380fbfa4c7b443918637423d7a0
Re-ran check in #30395 (review) . No extra period seen.
Ran unit/functional tests locally, including feature_assumeutxo (all passed).
5731@@ -5732,7 +5732,7 @@ util::Result<void> ChainstateManager::ActivateSnapshot(
5732 static_cast<size_t>(current_coinstip_cache_size * SNAPSHOT_CACHE_PERC));
5733 }
5734
5735- auto cleanup_bad_snapshot = [&](const char* reason) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
5736+ auto cleanup_bad_snapshot = [&](bilingual_str&& reason) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
In commit “rpc: Use untranslated error strings in loadtxoutset” (fa5b8920be041380fbfa4c7b443918637423d7a0)
Not important, but you could change this from bilingual_str&& to just bilingual_str so it is simpler, and function can be called naturally with both lvalues and rvalues, not just rvalues. Rvalues will be moved in any case.
