summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-09 15:34:56 +0100
committerErik Johnston <erik@matrix.org>2018-08-22 15:41:15 +0100
commit5c261107c9b5bf82a51c27fd6cb85e2199e539e3 (patch)
tree676491a6fd9f90c2aff02004bb781c5106399784 /synapse/handlers/federation.py
parentMerge branch 'master' into develop (diff)
downloadsynapse-5c261107c9b5bf82a51c27fd6cb85e2199e539e3.tar.xz
Remove unnecessary resolve_events_with_state_map
We only ever used the synchronous resolve_events_with_state_map in one
place, which is trivial to replace with the async version.
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 0ebf0fd188..3fa7a98445 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1831,7 +1831,7 @@ class FederationHandler(BaseHandler):
 
                 room_version = yield self.store.get_room_version(event.room_id)
 
-                new_state = self.state_handler.resolve_events(
+                new_state = yield self.state_handler.resolve_events(
                     room_version,
                     [list(local_view.values()), list(remote_view.values())],
                     event