diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-26 12:48:51 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-26 12:48:51 +0100 |
| commit | 21e878ebb60afd27269fb5b4d6df3d0d8c570a7f (patch) | |
| tree | 9b3e35f5fda84c64b2ecd927eb6eb8d6bd66d670 /synapse/storage/__init__.py | |
| parent | Merge pull request #2970 from matrix-org/matthew/filter_members (diff) | |
| download | synapse-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/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index ba88a54979..3bd63cd195 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -66,6 +66,7 @@ class DataStore(RoomMemberStore, RoomStore, PresenceStore, TransactionStore, DirectoryStore, KeyStore, StateStore, SignatureStore, ApplicationServiceStore, + EventsStore, EventFederationStore, MediaRepositoryStore, RejectionsStore, @@ -73,7 +74,6 @@ class DataStore(RoomMemberStore, RoomStore, PusherStore, PushRuleStore, ApplicationServiceTransactionStore, - EventsStore, ReceiptsStore, EndToEndKeyStore, SearchStore, |