From b851b3facfe7f573ca7a52fa924ecdc0fa8cc892 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 10 Nov 2021 11:56:12 +0000
Subject: [PATCH] Remove redundant parameters on `_check_event_auth`
as of #11012, these parameters are unused.
---
changelog.d/11292.misc | 1 +
synapse/handlers/federation_event.py | 10 ----------
tests/test_federation.py | 2 --
3 files changed, 1 insertion(+), 12 deletions(-)
create mode 100644 changelog.d/11292.misc
diff --git a/changelog.d/11292.misc b/changelog.d/11292.misc
new file mode 100644
index 000000000000..d1b76b157400
--- /dev/null
+++ b/changelog.d/11292.misc
@@ -0,0 +1 @@
+Remove unused parameters on `FederationEventHandler._check_event_auth`.
diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index 1a1cd93b1ae5..9917613298c6 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -981,8 +981,6 @@ async def _process_received_pdu(
origin,
event,
context,
- state=state,
- backfilled=backfilled,
)
except AuthError as e:
# FIXME richvdh 2021/10/07 I don't think this is reachable. Let's log it
@@ -1332,8 +1330,6 @@ async def _check_event_auth(
origin: str,
event: EventBase,
context: EventContext,
- state: Optional[Iterable[EventBase]] = None,
- backfilled: bool = False,
) -> EventContext:
"""
Checks whether an event should be rejected (for failing auth checks).
@@ -1344,12 +1340,6 @@ async def _check_event_auth(
context:
The event context.
- state:
- The state events used to check the event for soft-fail. If this is
- not provided the current state events will be used.
-
- backfilled: True if the event was backfilled.
-
Returns:
The updated context object.
diff --git a/tests/test_federation.py b/tests/test_federation.py
index 24fc77d7a772..3eef1c4c05c8 100644
--- a/tests/test_federation.py
+++ b/tests/test_federation.py
@@ -81,8 +81,6 @@ async def _check_event_auth(
origin,
event,
context,
- state=None,
- backfilled=False,
):
return context