diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2018-01-17 16:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 16:01:33 +0000 |
| commit | 8716eb492094d06c0793d633cdfd588ccfa5c72a (patch) | |
| tree | 3485cfde42832956df239d2b63cb038a6b401b49 /synapse/storage | |
| parent | Merge pull request #2795 from matrix-org/rav/track_db_scheduling (diff) | |
| parent | Split resolve_events into two functions (diff) | |
| download | synapse-8716eb492094d06c0793d633cdfd588ccfa5c72a.tar.xz | |
Merge pull request #2802 from matrix-org/rav/clean_up_resolve_events
Split resolve_events into two functions
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/events.py | 4 |
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, ) |