Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

3904cbf3

Unverified Commit 3904cbf3 authored 6 years ago by Erik Johnston Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase

Add v2 state resolution algorithm

parents e0b9d5f0 b313b9b0

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3786.misc 1 addition, 0 deletions

changelog.d/3786.misc
synapse/event_auth.py 1 addition, 1 deletion

synapse/event_auth.py
synapse/handlers/federation.py 15 additions, 15 deletions

synapse/handlers/federation.py
synapse/state/__init__.py 74 additions, 23 deletions

synapse/state/__init__.py
synapse/state/v1.py 1 addition, 1 deletion

synapse/state/v1.py
synapse/state/v2.py 544 additions, 0 deletions

synapse/state/v2.py
synapse/storage/events.py 24 additions, 21 deletions

synapse/storage/events.py
tests/state/__init__.py 0 additions, 0 deletions

tests/state/__init__.py
tests/state/test_v2.py 663 additions, 0 deletions

tests/state/test_v2.py

with 1323 additions and 61 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment