diff options
| author | David Robertson <davidr@element.io> | 2021-11-19 17:41:14 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2021-11-22 22:05:30 +0000 |
| commit | 53be2556e3a1a6fed3ba6ef55b375234084c04f8 (patch) | |
| tree | 5c904f9ca41acd6d2bd004f677e34e40270d79b3 /synapse/app/generic_worker.py | |
| parent | Add type annotations to `synapse.metrics` (#10847) (diff) | |
| download | synapse-53be2556e3a1a6fed3ba6ef55b375234084c04f8.tar.xz | |
Prune AdminCmdSlavedStore and GenericWorkerSlavedStore
both continue to inherit both removed classes via ... -> SlavedPushRuleStore -> SlavedEventStore -> BaseSlavedStore
Diffstat (limited to 'synapse/app/generic_worker.py')
| -rw-r--r-- | synapse/app/generic_worker.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index 502cc8e8d1..00a2646fcf 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -48,14 +48,12 @@ from synapse.http.site import SynapseRequest, SynapseSite from synapse.logging.context import LoggingContext from synapse.metrics import METRICS_PREFIX, MetricsResource, RegistryProxy from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource -from synapse.replication.slave.storage._base import BaseSlavedStore from synapse.replication.slave.storage.account_data import SlavedAccountDataStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore from synapse.replication.slave.storage.client_ips import SlavedClientIpStore from synapse.replication.slave.storage.deviceinbox import SlavedDeviceInboxStore from synapse.replication.slave.storage.devices import SlavedDeviceStore from synapse.replication.slave.storage.directory import DirectoryStore -from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.filtering import SlavedFilteringStore from synapse.replication.slave.storage.groups import SlavedGroupServerStore from synapse.replication.slave.storage.keys import SlavedKeyStore @@ -237,7 +235,6 @@ class GenericWorkerSlavedStore( SlavedPusherStore, CensorEventsStore, ClientIpWorkerStore, - SlavedEventStore, SlavedKeyStore, RoomWorkerStore, DirectoryStore, @@ -253,7 +250,6 @@ class GenericWorkerSlavedStore( TransactionWorkerStore, LockStore, SessionStore, - BaseSlavedStore, ): # Properties that multiple storage classes define. Tell mypy what the # expected type is. |