Return visitor errors over skip_decode errors if there are any #58
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
|
is it possible to add a test to check for this behaviour? |
Good comment; lemme look at doing that! |
niklasad1
reviewed
Jun 7, 2024
scale-decode/src/visitor/decode.rs
Outdated
| @@ -123,10 +123,17 @@ impl<'temp, 'scale, 'resolver, V: Visitor> ResolvedTypeVisitor<'resolver> | |||
| let res = self.visitor.visit_composite(&mut items, self.type_id); | |||
|
|
|||
| // Skip over any bytes that the visitor chose not to decode: | |||
| items.skip_decoding()?; | |||
| *self.data = items.bytes_from_undecoded(); | |||
| let skip_res = items.skip_decoding(); | |||
There was a problem hiding this comment.
Is it possible to extract "this logic" to a helper function that we can re-use instead repeating it for the other visitors?
There was a problem hiding this comment.
the types are all a bit different and just happen to have the same method names; it could be a macro though :)
niklasad1
approved these changes
Jun 7, 2024
|
I added tests to confirm the behaviour, all of which fail on |
lexnv
approved these changes
Jun 7, 2024
Merged
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Before this, if we hit an error when skipping over any remaining composite/variant/tuple/sequence items, we'd return that error, even if the visitor which we called returned an error of its own. This would obscure more meaningful errors behind vague skip_decode ones.
Now we prioritize returning visitor errors if there are any, to get somehting more useful back!