From 8ab06340f0c3b2042d7faae621b1fed7d5297d54 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Mon, 30 May 2022 14:04:45 +0100 Subject: [PATCH] Clarify conflicted state set? --- content/rooms/fragments/v2-state-res.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/content/rooms/fragments/v2-state-res.md b/content/rooms/fragments/v2-state-res.md index dd0b0e63e..ab8b579a4 100644 --- a/content/rooms/fragments/v2-state-res.md +++ b/content/rooms/fragments/v2-state-res.md @@ -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 *Si* can be divided into -two collections. If a given key *K* is present in every *Si* 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 *Si* 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 *Si* can be +divided into two collections. +If a given key *K* is present in every *Si* 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.**