summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-17 15:44:31 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-17 15:44:31 +0000
commit390093d45e1951b1a1d8a034667d2e84b3bf064d (patch)
tree3485cfde42832956df239d2b63cb038a6b401b49 /synapse/storage
parentMerge pull request #2795 from matrix-org/rav/track_db_scheduling (diff)
downloadsynapse-390093d45e1951b1a1d8a034667d2e84b3bf064d.tar.xz
Split resolve_events into two functions
... so that the return type doesn't depend on the arg types
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index ad1d782705..c5292a5311 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -27,7 +27,7 @@ from synapse.util.logutils import log_function
 from synapse.util.metrics import Measure
 from synapse.api.constants import EventTypes
 from synapse.api.errors import SynapseError
-from synapse.state import resolve_events
+from synapse.state import resolve_events_with_factory
 from synapse.util.caches.descriptors import cached
 from synapse.types import get_domain_from_id
 
@@ -557,7 +557,7 @@ class EventsStore(SQLBaseStore):
                         to_return.update(evs)
                     defer.returnValue(to_return)
 
-                current_state = yield resolve_events(
+                current_state = yield resolve_events_with_factory(
                     state_sets,
                     state_map_factory=get_events,
                 )