Skip to content

Commit

Permalink
Clarify conflicted state set?
Browse files Browse the repository at this point in the history
  • Loading branch information
David Robertson committed May 30, 2022
1 parent 8c4c09f commit 8ab0634
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions content/rooms/fragments/v2-state-res.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ the `membership` is `leave` or `ban` and the `sender` does not match the
might remove someone's ability to do something in the room.

**Unconflicted state map and conflicted state set.**
The key-value pairs across all state maps *S<sub>i</sub>* can be divided into
two collections. 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*. Otherwise (*K*, *V*) belongs to the
*conflicted state set*.

Note that the unconflicted state map only has one event per `(event_type, state_key)`,
The keys of the state maps *S<sub>i</sub>* are 2-tuples of strings of the form
*K* = `(event_type, state_key)`. The values *V* are state events.
The key-value pairs (*K*, *V*) across all state maps *S<sub>i</sub>* can be
divided into two collections.
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*.
Otherwise (*K*, *V*) belongs to the *conflicted state set*.

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.

**Auth chain.**
Expand Down

0 comments on commit 8ab0634

Please sign in to comment.