From 7dd1c5c542d58464085b11ababe746c6a60515ec Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 3 Feb 2015 16:12:04 +0000
Subject: [PATCH] Neaten the handling of state and auth_chain up a bit

---
 synapse/handlers/federation.py | 59 ++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 6727155c38..86953bf8c8 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -30,6 +30,7 @@ from synapse.types import UserID
 
 from twisted.internet import defer
 
+import itertools
 import logging
 
 
@@ -112,14 +113,6 @@ class FederationHandler(BaseHandler):
 
         logger.debug("Event: %s", event)
 
-        event_ids = set()
-        if state:
-            event_ids |= {e.event_id for e in state}
-        if auth_chain:
-            event_ids |= {e.event_id for e in auth_chain}
-
-        seen_ids = (yield self.store.have_events(event_ids)).keys()
-
         # FIXME (erikj): Awful hack to make the case where we are not currently
         # in the room work
         current_state = None
@@ -131,27 +124,37 @@ class FederationHandler(BaseHandler):
             logger.debug("Got event for room we're not in.")
             current_state = state
 
-        if state and auth_chain is not None:
-            for list_of_pdus in [auth_chain, state]:
-                for e in list_of_pdus:
-                    if e.event_id in seen_ids:
-                        continue
+        event_ids = set()
+        if state:
+            event_ids |= {e.event_id for e in state}
+        if auth_chain:
+            event_ids |= {e.event_id for e in auth_chain}
 
-                    e.internal_metadata.outlier = True
-                    try:
-                        auth_ids = [e_id for e_id, _ in e.auth_events]
-                        auth = {
-                            (e.type, e.state_key): e for e in auth_chain
-                            if e.event_id in auth_ids
-                        }
-                        yield self._handle_new_event(
-                            origin, e, auth_events=auth
-                        )
-                    except:
-                        logger.exception(
-                            "Failed to handle state event %s",
-                            e.event_id,
-                        )
+        seen_ids = (yield self.store.have_events(event_ids)).keys()
+
+        if state and auth_chain is not None:
+            # If we have any state or auth_chain given to us by the replication
+            # layer, then we should handle them (if we haven't before.)
+            for e in itertools.chain(auth_chain, state):
+                if e.event_id in seen_ids:
+                    continue
+
+                e.internal_metadata.outlier = True
+                try:
+                    auth_ids = [e_id for e_id, _ in e.auth_events]
+                    auth = {
+                        (e.type, e.state_key): e for e in auth_chain
+                        if e.event_id in auth_ids
+                    }
+                    yield self._handle_new_event(
+                        origin, e, auth_events=auth
+                    )
+                    seen_ids.add(e.event_id)
+                except:
+                    logger.exception(
+                        "Failed to handle state event %s",
+                        e.event_id,
+                    )
 
         try:
             yield self._handle_new_event(