Skip to content

Commit

Permalink
Update example
Browse files Browse the repository at this point in the history
  • Loading branch information
erikjohnston committed Dec 11, 2018
1 parent 8a3e7b7 commit a8bd2f3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions proposals/1442-state-resolution.md
Original file line number Diff line number Diff line change
Expand Up @@ -547,15 +547,15 @@ This gives the resolved state at _Message 3_ to be _Topic 4_.

## Example 2

The following is an example room DAG, where time flows down the page. We assume
event `B` is initially rejected by the server (due to not passing auth against
the state), but does pass auth against its auth chain.
The following is an example room DAG, where time flows down the page. The event
`D` is initially rejected by the server (due to not passing auth against the
state), but does pass auth against its auth chain.

![state-res-rejected.png](images/state-res-rejected.png)

At `C` we first resolve the power levels, which results in `A`. When we then go
At `F` we first resolve the power levels, which results in `E`. When we then go
to resolve the topics against the partially resolved state Bob has ops, and so
the resolved state include the topic change `B`, even though it was initially
the resolved state include the topic change `D`, even though it was initially
rejected.


Expand Down
Binary file modified proposals/images/state-res-rejected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a8bd2f3

Please sign in to comment.