Fix bundle merge reveal check #116
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
dr-orlovsky
reviewed
Dec 26, 2023
src/accessors/merge_reveal.rs
Outdated
| @@ -187,12 +187,12 @@ impl<Seal: ExposedSeal> MergeReveal for Assignments<Seal> { | |||
| impl MergeReveal for TransitionBundle { | |||
| fn merge_reveal(mut self, other: Self) -> Result<Self, MergeRevealError> { | |||
| debug_assert_eq!(self.commitment_id(), other.commitment_id()); | |||
| if self.known_transitions.len() + other.known_transitions.len() > self.input_map.len() || | |||
| if self.input_map.len() < other.known_transitions.len() || | |||
There was a problem hiding this comment.
I think we need to take into account both self and other when do comparison. Why do you think the original version was buggy?
There was a problem hiding this comment.
All right, I see. I think it should be this way: first we do extend, than we do check
There was a problem hiding this comment.
I imagined that the original version made a purposeful comparison between self and other, so I adjusted it to a verification that made more sense.
So, should we first do the extend and then check if the amount of input_map is less than the known_transitions ?
theacdutra
force-pushed
the
fix/bundle-merge-check
branch
from
1f09376 to
d53454a
Compare
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.
Description
This PR intent fix the merge reveal bundle check. Also, adjusts the error message for correct naming.