Conflicted state set is a set of events #1120
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
added 2 commits
June 13, 2022 17:07
In #1042 I incorrectly wrote that the conflicted state set is a set of pairs (K, V). We later take the union of the conflicted state set and the auth difference. The latter is a set of events (V) only. Fix this by making the conflicted state set a set of events rather than a set of pairs. That is, the conflicted state set is a a `Set[Event]` instead of a `Set[((type, state key), event)]`.
DMRobertson
commented
Jun 13, 2022
richvdh
approved these changes
Jun 14, 2022
66 tasks
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.
In #1042 I incorrectly wrote that the conflicted state set is a set of
pairs (K, V). We later take the union of the conflicted state set and
the auth difference. The latter is a set of events (V) only.
Fix this by making the conflicted state set a set of events rather than
a set of pairs. That is, the conflicted state set is a a
Set[Event]instead of a
Set[((type, state key), event)].Preview: https://pr1120--matrix-spec-previews.netlify.app