summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-26 12:48:51 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-26 12:48:51 +0100
commit21e878ebb60afd27269fb5b4d6df3d0d8c570a7f (patch)
tree9b3e35f5fda84c64b2ecd927eb6eb8d6bd66d670 /synapse/storage/appservice.py
parentMerge pull request #2970 from matrix-org/matthew/filter_members (diff)
downloadsynapse-21e878ebb60afd27269fb5b4d6df3d0d8c570a7f.tar.xz
Make EventStore inherit from EventFederationStore
(since it uses methods therein)

Turns out that we had a bunch of things which were incorrectly importing
EventWorkerStore from events.py rather than events_worker.py, which broke once
I removed the import into events.py.
Diffstat (limited to 'synapse/storage/appservice.py')
-rw-r--r--synapse/storage/appservice.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index 9f12b360bc..31248d5e06 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -22,7 +22,7 @@ from twisted.internet import defer
 
 from synapse.appservice import AppServiceTransaction
 from synapse.config.appservice import load_appservices
-from synapse.storage.events import EventsWorkerStore
+from synapse.storage.events_worker import EventsWorkerStore
 
 from ._base import SQLBaseStore