diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index e9c5d1026a..c4d96749a3 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -169,11 +169,8 @@ class FederationHandler(BaseHandler):
defer.returnValue(None)
state = None
-
auth_chain = []
- fetch_state = False
-
# Get missing pdus if necessary.
if not pdu.internal_metadata.is_outlier():
# We only backfill backwards to the min depth.
@@ -252,9 +249,10 @@ class FederationHandler(BaseHandler):
# Ask the remote server for the states we don't
# know about
for p in prevs - seen:
- state, got_auth_chain = yield self.replication_layer.get_state_for_room(
- origin, pdu.room_id, p
- )
+ state, got_auth_chain = (
+ yield self.replication_layer.get_state_for_room(
+ origin, pdu.room_id, p
+ ))
auth_chains.update(got_auth_chain)
state_group = {(x.type, x.state_key): x.event_id for x in state}
state_groups.append(state_group)
diff --git a/tests/test_federation.py b/tests/test_federation.py
index 95fa73723c..fc80a69369 100644
--- a/tests/test_federation.py
+++ b/tests/test_federation.py
@@ -1,18 +1,15 @@
-from twisted.internet.defer import Deferred, succeed, maybeDeferred
+from twisted.internet.defer import succeed, maybeDeferred
from synapse.util import Clock
from synapse.events import FrozenEvent
from synapse.types import Requester, UserID
-from synapse.replication.slave.storage.events import SlavedEventStore
from tests import unittest
-from tests.server import make_request, setup_test_homeserver, ThreadedMemoryReactorClock
+from tests.server import setup_test_homeserver, ThreadedMemoryReactorClock
from mock import Mock
-from synapse.api.errors import CodeMessageException, HttpResponseException
-
class MessageAcceptTests(unittest.TestCase):
def setUp(self):
|
