Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pep8

This commit is contained in:
Amber Brown 2018-06-27 11:38:14 +01:00
parent 94f09618e5
commit f03a5d1a17
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/federation.py
View File

@ -169,11 +169,8 @@ class FederationHandler(BaseHandler):
defer.returnValue(None) defer.returnValue(None)
state = None state = None
auth_chain = [] auth_chain = []
fetch_state = False
# Get missing pdus if necessary. # Get missing pdus if necessary.
if not pdu.internal_metadata.is_outlier(): if not pdu.internal_metadata.is_outlier():
# We only backfill backwards to the min depth. # 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 # Ask the remote server for the states we don't
# know about # know about
for p in prevs - seen: for p in prevs - seen:
state, got_auth_chain = yield self.replication_layer.get_state_for_room( state, got_auth_chain = (
yield self.replication_layer.get_state_for_room(
origin, pdu.room_id, p origin, pdu.room_id, p
) ))
auth_chains.update(got_auth_chain) auth_chains.update(got_auth_chain)
state_group = {(x.type, x.state_key): x.event_id for x in state} state_group = {(x.type, x.state_key): x.event_id for x in state}
state_groups.append(state_group) state_groups.append(state_group)

7
tests/test_federation.py
View File

@ -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.util import Clock
from synapse.events import FrozenEvent from synapse.events import FrozenEvent
from synapse.types import Requester, UserID from synapse.types import Requester, UserID
from synapse.replication.slave.storage.events import SlavedEventStore
from tests import unittest 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 mock import Mock
from synapse.api.errors import CodeMessageException, HttpResponseException
class MessageAcceptTests(unittest.TestCase): class MessageAcceptTests(unittest.TestCase):
def setUp(self): def setUp(self):