Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-01 17:24:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Conflicted state set is a set of events (#1120)

Browse source 
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)]`.
This commit is contained in:
David Robertson 2022-06-14 17:07:16 +01:00 committed by GitHub
parent cbdd889fa8
commit 580be61df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/room_versions/newsfragments/1120.clarification Normal file
View file

@ -0,0 +1 @@
Improve readability and understanding of the state resolution algorithms.

4
content/rooms/fragments/v2-state-res.md
View file

@ -36,10 +36,10 @@ The key-value pairs (*K*, *V*) across all state maps *S<sub>i</sub>* can be
divided into two collections. divided into two collections.
If a given key *K* is present in every *S<sub>i</sub>* with the same value *V* If a given key *K* is present in every *S<sub>i</sub>* with the same value *V*
in each state map, then the pair (*K*, *V*) belongs to the *unconflicted state map*. in each state map, then the pair (*K*, *V*) belongs to the *unconflicted state map*.
Otherwise (*K*, *V*) belongs to the *conflicted state set*. Otherwise, *V* belongs to the *conflicted state set*.
Note that the unconflicted state map only has one event for each key *K*, Note that the unconflicted state map only has one event for each key *K*,
whereas the conflicted state set may associate multiple events to the same key. whereas the conflicted state set may contain multiple events with the same key.
**Auth chain.** **Auth chain.**
The *auth chain* of an event *E* is the set containing all of *E*'s auth events, The *auth chain* of an event *E* is the set containing all of *E*'s auth events,