Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-20 16:38:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix unintentional stateres change added in #1042 (#1158)

Browse source 
* Fix unintentional stateres change added in #1042

* Changelog
This commit is contained in:
David Robertson 2022-07-05 16:46:46 +01:00 committed by GitHub
parent cf6544c028
commit cc7cc4a44d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1 @@
For room versions 2–10: correct a mistaken clarification to the state resolution algorithm.

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

@ -138,9 +138,11 @@ the auth event is not rejected.
The *resolution* of a set of states is obtained as follows: The *resolution* of a set of states is obtained as follows:
1. Select all *power events* that appear in the *full conflicted set*. Compute 1. Select the set *X* of all *power events* that appear in the *full
the union of their auth chains, including the power events themselves. conflicted set*. For each such power event *P*, enlarge *X* by adding
Sort the union using the *reverse topological power ordering*. the events in the auth chain of *P* which also belong to the full
conflicted set. Sort $X$ into a list using the *reverse topological
power ordering*.
2. Apply the *iterative auth checks algorithm*, starting from the 2. Apply the *iterative auth checks algorithm*, starting from the
*unconflicted state map*, to the list of events from the previous *unconflicted state map*, to the list of events from the previous
step to get a partially resolved state. step to get a partially resolved state.