Merge pull request #2465 from uhoreg/state_res_clarification

clarify first run of iterative auth checks
pull/2471/head
Hubert Chathi 6 years ago committed by GitHub
commit 9e7bcaac9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -148,8 +148,8 @@ The *resolution* of a set of states is obtained as follows:
1. Take all *power events* and any events in their auth chains, recursively, 1. Take all *power events* and any events in their auth chains, recursively,
that appear in the *full conflicted set* and order them by the *reverse that appear in the *full conflicted set* and order them by the *reverse
topological power ordering*. topological power ordering*.
2. Apply the *iterative auth checks algorithm* on the *unconflicted state map* 2. Apply the *iterative auth checks algorithm*, starting from the *unconflicted state map*,
and the list of events from the previous step to get a partially resolved to the list of events from the previous step to get a partially resolved
state. state.
3. Take all remaining events that weren't picked in step 1 and order them by 3. Take all remaining events that weren't picked in step 1 and order them by
the mainline ordering based on the power level in the partially resolved the mainline ordering based on the power level in the partially resolved

Loading…
Cancel
Save