Small refactors to remove unwraps #475
Merged
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
A couple of replacements of `unwrap` for `expect` with proper messages. In partial_chain.rs `get_validation_flags` now takes the hash directly from the caller, avoiding the `unwrap` (exactly as we do for `get_validation_flags` in chain_state.rs). In `get_leaf_hashes` (udata.rs) we instead take the TxOut directly. We also avoid computing the txid twice by passing it.
lucad70
approved these changes
May 7, 2025
There was a problem hiding this comment.
At first I was concerned about the change on the get_leaf_hashes() as I thought it was being used elsewhere but as it isn't and you address its usage later on the code (at what used to be line 475), I believe it is alright.
Overall I am not a fan of using expect even while guaranteeing the impossibility of error, however, as discussed previously, this is accordingly to objectives, so, ACK d08ad21
luisschwab
pushed a commit
to luisschwab/Floresta
that referenced
this pull request
May 8, 2025
A couple of replacements of `unwrap` for `expect` with proper messages. In partial_chain.rs `get_validation_flags` now takes the hash directly from the caller, avoiding the `unwrap` (exactly as we do for `get_validation_flags` in chain_state.rs). In `get_leaf_hashes` (udata.rs) we instead take the TxOut directly. We also avoid computing the txid twice by passing it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What is the purpose of this pull request?
Which crates are being modified?
Description
Relates to #463. A couple of replacements of
unwrapforexpectwith proper messages.In partial_chain.rs
get_validation_flagsnow takes the hash directly from the caller, avoiding theunwrap(exactly as we do forget_validation_flagsin chain_state.rs).In
get_leaf_hashes(udata.rs) we instead take the TxOut directly. We also avoid computing the txid twice by passing it.Notes to the reviewers
The only remaining
unwrapsinfloresta-chainare inchain_state.rs. We can then remove them (with a bit of error handling) and enforce they are not re-introduced.