summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-05-22 19:00:48 +0100
committerErik Johnston <erik@matrix.org>2018-05-22 19:02:36 +0100
commit586b66b1977e2c678e23a3b2d25a5b699b637a8e (patch)
treec0baa4a62fef435bd2398b2c2e70c4ba42a32117 /synapse/handlers
parentget_domains_from_state returns list of tuples (diff)
downloadsynapse-586b66b1977e2c678e23a3b2d25a5b699b637a8e.tar.xz
Fix that states is a dict of dicts
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index c85d194511..6a381f0023 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -853,10 +853,13 @@ class FederationHandler(BaseHandler):
             [resolve(room_id, [e]) for e in event_ids],
             consumeErrors=True,
         ))
+
+        # dict[str, dict[tuple, str]], a map from event_id to state map of
+        # event_ids.
         states = dict(zip(event_ids, [s.state for s in states]))
 
         state_map = yield self.store.get_events(
-            [e_id for ids in states.values() for e_id in ids],
+            [e_id for ids in states.values() for e_id in ids.itervalues()],
             get_prev_content=False
         )
         states = {