summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-24 09:44:22 +0100
committerErik Johnston <erik@matrix.org>2018-10-24 09:44:22 +0100
commit810715f79aafc586e70e9dcd3da4a2cc6823f704 (patch)
tree73357359f52508df508c0a2436114691a61df339 /synapse/handlers
parentUpdate event_auth table for rejected events (diff)
downloadsynapse-810715f79aafc586e70e9dcd3da4a2cc6823f704.tar.xz
Rename resolve_events_with_factory
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index b028d58ae4..91a18a552c 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -53,7 +53,7 @@ from synapse.replication.http.federation import (
     ReplicationFederationSendEventsRestServlet,
 )
 from synapse.replication.http.membership import ReplicationUserJoinedLeftRoomRestServlet
-from synapse.state import StateResolutionStore, resolve_events_with_factory
+from synapse.state import StateResolutionStore, resolve_events_with_store
 from synapse.types import UserID, get_domain_from_id
 from synapse.util import logcontext, unwrapFirstError
 from synapse.util.async_helpers import Linearizer
@@ -385,7 +385,7 @@ class FederationHandler(BaseHandler):
                                 event_map[x.event_id] = x
 
                     room_version = yield self.store.get_room_version(room_id)
-                    state_map = yield resolve_events_with_factory(
+                    state_map = yield resolve_events_with_store(
                         room_version, state_maps, event_map,
                         state_res_store=StateResolutionStore(self.store),
                     )