diff options
| author | Richard van der Hoff <richard@matrix.org> | 2022-06-13 11:34:59 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2022-06-13 11:34:59 +0100 |
| commit | f68b5e5773a9e74c0f895190aaedce41f8565fa7 (patch) | |
| tree | 0601c8b98bc68e25e7466cd220d8034cac29f27f /synapse/state | |
| parent | Revert "Changelog" (diff) | |
| parent | changelog (diff) | |
| download | synapse-f68b5e5773a9e74c0f895190aaedce41f8565fa7.tar.xz | |
Merge branch 'rav/simplify_event_auth_interface' into develop
Diffstat (limited to 'synapse/state')
| -rw-r--r-- | synapse/state/v1.py | 4 | ||||
| -rw-r--r-- | synapse/state/v2.py | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 499a328201..8bbb4ce41c 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -30,7 +30,7 @@ from typing import ( from synapse import event_auth from synapse.api.constants import EventTypes from synapse.api.errors import AuthError -from synapse.api.room_versions import RoomVersion, RoomVersions +from synapse.api.room_versions import RoomVersion from synapse.events import EventBase from synapse.types import MutableStateMap, StateMap @@ -331,7 +331,6 @@ def _resolve_auth_events( try: # The signatures have already been checked at this point event_auth.check_auth_rules_for_event( - RoomVersions.V1, event, auth_events.values(), ) @@ -349,7 +348,6 @@ def _resolve_normal_events( try: # The signatures have already been checked at this point event_auth.check_auth_rules_for_event( - RoomVersions.V1, event, auth_events.values(), ) diff --git a/synapse/state/v2.py b/synapse/state/v2.py index 0e609114ef..6a16f38a15 100644 --- a/synapse/state/v2.py +++ b/synapse/state/v2.py @@ -574,7 +574,6 @@ async def _iterative_auth_checks( try: event_auth.check_auth_rules_for_event( - room_version, event, auth_events.values(), ) |