summary refs log tree commit diff
path: root/synapse/storage/event_federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-31 13:44:04 +0100
committerGitHub <noreply@github.com>2018-07-31 13:44:04 +0100
commit5de936caa1c1d607c39b09909ee983568e31ebb1 (patch)
tree2ef87b37cdef97b54375d575216dd60039d31d1b /synapse/storage/event_federation.py
parentMerge pull request #3629 from ptman/patch-1 (diff)
parentreinstate explicit include of EventsWorkerStore (diff)
downloadsynapse-5de936caa1c1d607c39b09909ee983568e31ebb1.tar.xz
Merge pull request #3612 from matrix-org/rav/store_heirarchy
Make EventStore inherit from EventFederationStore
Diffstat (limited to 'synapse/storage/event_federation.py')
-rw-r--r--synapse/storage/event_federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py
index 5d3ee90017..8bd35df119 100644
--- a/synapse/storage/event_federation.py
+++ b/synapse/storage/event_federation.py
@@ -25,7 +25,7 @@ from twisted.internet import defer
 from synapse.api.errors import StoreError
 from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.storage._base import SQLBaseStore
-from synapse.storage.events import EventsWorkerStore
+from synapse.storage.events_worker import EventsWorkerStore
 from synapse.storage.signatures import SignatureWorkerStore
 from synapse.util.caches.descriptors import cached