diff options
author | Richard van der Hoff <richard@matrix.org> | 2022-06-10 10:48:25 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2022-06-12 23:13:10 +0100 |
commit | 0d9d36b15c3cd2851f1cf3452c096480f568e6cb (patch) | |
tree | 5039968d06b3e12ae487aa53ec785947b554f7f7 /synapse/state | |
parent | Remove `room_version` param from `validate_event_for_room_version` (diff) | |
download | synapse-0d9d36b15c3cd2851f1cf3452c096480f568e6cb.tar.xz |
Remove `room_version` param from `check_auth_rules_for_event`
Instead, use the `room_version` property of the event we're checking. The `room_version` was originally added as a parameter somewhere around #4482, but really it's been redundant since #6875 added a `room_version` field to `EventBase`.
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 c618df2fde..041ccac59e 100644 --- a/synapse/state/v2.py +++ b/synapse/state/v2.py @@ -547,7 +547,6 @@ async def _iterative_auth_checks( try: event_auth.check_auth_rules_for_event( - room_version, event, auth_events.values(), ) |