refactor: Use util::Result class for wallet loading #25722
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code Coverage & BenchmarksFor details see: https://corecheck.dev/bitcoin/bitcoin/pulls/25722. ReviewsSee the guideline for information on the review process. ConflictsReviewers, 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. |
This was referenced Jul 27, 2022
bc4172e to
a09c21c
Compare
a09c21c to
e7457d0
Compare
ryanofsky
added a commit
to ryanofsky/bitcoin
that referenced
this pull request
Jul 31, 2025
Suggested by Martin Leitner-Ankerl <martin.ankerl@gmail.com> bitcoin#25722 (comment) Co-authored-by: Martin Leitner-Ankerl <martin.ankerl@gmail.com>
The util::ResultPtr class is a wrapper for util::Result providing syntax sugar to make it less awkward to use with returned pointers. Instead of needing to be deferenced twice with **result or (*result)->member, it only needs to be dereferenced once with *result or result->member. Also when it is used in a boolean context, instead of evaluating to true when there is no error and the pointer is null, it evaluates to false so it is straightforward to determine whether the result points to something. This PR is only partial a solution to bitcoin#26004 because while it makes it easier to check for null pointer values, it does not make it impossible to return a null pointer value inside a successful result. It would be possible to enforce that successful results always contain non-null pointers by using a not_null type (bitcoin#24423) in combination with ResultPtr, though.
-BEGIN VERIFY SCRIPT- git grep -l DatabaseStatus src | xargs sed -i s/DatabaseStatus/DatabaseError/g sed -i '/^ SUCCESS,$/d' src/wallet/db.h -END VERIFY SCRIPT-
88dfdac to
96f6613
Compare
This was referenced Aug 2, 2025
|
🐙 This pull request conflicts with the target branch and needs rebase. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is based on #25665 + #26022. The non-base commits are:
7bbb37f95f66Add temporary ResultExtract helper for porting to util::Resultdadd24c9c399refactor: Use util::Result class in wallet/sqlited9d14d19bc4brefactor: Use util::Result class in wallet/migrate4b38596b7b77refactor: Use util::Result class in wallet::MakeDatabase739356926fderefactor: Use util::Result class in wallet/dump595b349e1b84refactor: Use util::Result class in wallet/wallettool7b0f6a7f2933refactor: Use util::Result class in wallet/wallet198baa48646brefactor: Use util::Result class in wallet/load70f53f9d0adbrefactor: Use util::Result class in wallet/rpc76f729cef797refactor: Use util::Result class in wallet/interfaces1aef3de77466refactor: Use util::Result class in wallet/testccb530a4c048Drop temporary ResultExtract helper for porting to util::Result96f66136f028scripted-diff: replace wallet DatabaseStatus with DatabaseErrorWallet loading functions up and down the stack have lots of error and warning parameters, and return error information in different ways. This PR makes them uniformly return
util::Result, without changing behavior.