This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Handle rlp decoding Result in patricia trie #8166
Merged
Conversation
This file contains 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
|
It looks like @ascjones signed our Contributor License Agreement. 👍 Many thanks, Parity Technologies CLA Bot |
debris
approved these changes
Mar 21, 2018
| // something went wrong. | ||
| _ => panic!("Rlp is not valid.") | ||
| _ => Err(DecoderError::Custom("Rlp is not valid.")) |
There was a problem hiding this comment.
maybe use bail! instead docs
| self.fmt_all(Node::decoded(&node), f, deepness)?; | ||
| match Node::decoded(&node) { | ||
| Ok(n) => self.fmt_all(n, f, deepness)?, | ||
| Err(err) => writeln!(f, "ERROR decoding node extension Rlp: {}", err)?, |
There was a problem hiding this comment.
unrelated:
instead of writeln, we should use debug_struct which takes into an account an alternate flag of the formatter which allows pretty-printing
debris
added
A8-looksgood 🦄
debris
reviewed
Mar 21, 2018
util/patricia_trie/src/node.rs
Outdated
| @@ -63,7 +63,7 @@ impl<'a> Node<'a> { | |||
| // an empty branch index. | |||
| Prototype::Data(0) => Ok(Node::Empty), | |||
| // something went wrong. | |||
| _ => Err(DecoderError::Custom("Rlp is not valid.")) | |||
| _ => bail!("Rlp is not valid.") | |||
There was a problem hiding this comment.
ah, sorry. I thought that this Error is already an error from error_chain. Wouldn't ask for this change if I knew it was not.
debris
force-pushed
the
patricia_trie_rlp
branch
from
2c4b777
to
83aba3e
Compare
|
I reverted this last commit. Sorry, my suggestion was wrong. I'll merge the pr once it's green |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Part of #8033, replacing existing usage of
RlpwithUntrustedRlp.Unwraps the result of decoding a node's rlp, assuming valid rlp since it is a local read from the db.
Next step might be to introduce another case to TrieError for a DecoderError to avoid the unwraps.