-
Notifications
You must be signed in to change notification settings - Fork 389
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MSC1693: Specify how to handle rejected events in new state res #1693
Merged
Merged
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
3d3b77e
Specify how to handle rejected events in new state res
erikjohnston 4790432
Update rejected events discussion
erikjohnston 4df346a
Add metadata about update
erikjohnston 40d943f
Clarify 'auth difference' definition
erikjohnston 25fb09b
Fix up formatting
erikjohnston 1f1ba28
ACTUALLY! Let's just accept rejected events, because what's the worst…
erikjohnston a6aab37
Typo
erikjohnston b8a8d13
Note why convergence is desirable
erikjohnston a80ff2f
Don't use rejected auth events
erikjohnston 6c9a433
Add example of rejected events getting into state
erikjohnston eaaf36e
Update proposals/1442-state-resolution.md
richvdh c581c61
Update proposals/1442-state-resolution.md
richvdh 539ca4c
Update proposals/1442-state-resolution.md
richvdh f064554
Update proposals/1442-state-resolution.md
richvdh 612d8a6
Update proposals/1442-state-resolution.md
richvdh 7782781
Update wording to be betterer
richvdh 8a3e7b7
Add missing apostrophe
erikjohnston a8bd2f3
Update example
erikjohnston bc9d205
Make lines bold
erikjohnston b695eb0
Clarify example
erikjohnston 463c71a
Add a note about the examples
erikjohnston 48d271e
Clarifications
erikjohnston 39f7c77
Add dot for image file
erikjohnston 8fb2bd2
Fix typo
erikjohnston File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
digraph Rejected { | ||
rankdir=BT; | ||
|
||
// Events | ||
A[label="A: Alice ops Bob"]; | ||
B[label="B: Alice deops Bob"]; | ||
D[label="D: Bob sets topic"]; | ||
E[label="E: Alice reops Bob"]; | ||
|
||
// Prev events | ||
B -> A; | ||
C -> B; | ||
D -> C; | ||
E -> C; | ||
F -> D; | ||
F -> E; | ||
|
||
// Auth Events | ||
|
||
B -> A [color=blue,style=bold]; | ||
D -> A [color=blue,style=bold]; | ||
E -> B [color=blue,style=bold]; | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i still think it would be useful to have the summary of:
in here somehow, to make it clear what the bigger picture for rejections is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally that would be in the section of the spec which talks about how to handle rejections, not sure if it makes sense to duplicate it here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does it actually exist in that bit of the spec, though? i still think it's key to understanding this part of the world, and it needs to be spelt out clearly int he spec.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll go and add it to the spec then and block this MSC on that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#1755