summary refs log tree commit diff
path: root/synapse/replication/slave/storage/deviceinbox.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-09 13:53:21 +0000
committerGitHub <noreply@github.com>2019-12-09 13:53:21 +0000
commit30e9adf32f7db9aa44693876d33692bf4590d363 (patch)
tree9b83e1dc2eeefaafe8eca4e5b95cffdf8572b346 /synapse/replication/slave/storage/deviceinbox.py
parentMerge pull request #6493 from matrix-org/erikj/invite_state_config (diff)
parentFix comment (diff)
downloadsynapse-30e9adf32f7db9aa44693876d33692bf4590d363.tar.xz
Merge pull request #6487 from matrix-org/erikj/pass_in_db
Pass in Database object to data stores.
Diffstat (limited to 'synapse/replication/slave/storage/deviceinbox.py')
-rw-r--r--synapse/replication/slave/storage/deviceinbox.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/deviceinbox.py b/synapse/replication/slave/storage/deviceinbox.py
index 9fb6c5c6ff..0c237c6e0f 100644
--- a/synapse/replication/slave/storage/deviceinbox.py
+++ b/synapse/replication/slave/storage/deviceinbox.py
@@ -16,13 +16,14 @@
 from synapse.replication.slave.storage._base import BaseSlavedStore
 from synapse.replication.slave.storage._slaved_id_tracker import SlavedIdTracker
 from synapse.storage.data_stores.main.deviceinbox import DeviceInboxWorkerStore
+from synapse.storage.database import Database
 from synapse.util.caches.expiringcache import ExpiringCache
 from synapse.util.caches.stream_change_cache import StreamChangeCache
 
 
 class SlavedDeviceInboxStore(DeviceInboxWorkerStore, BaseSlavedStore):
-    def __init__(self, db_conn, hs):
-        super(SlavedDeviceInboxStore, self).__init__(db_conn, hs)
+    def __init__(self, database: Database, db_conn, hs):
+        super(SlavedDeviceInboxStore, self).__init__(database, db_conn, hs)
         self._device_inbox_id_gen = SlavedIdTracker(
             db_conn, "device_max_stream_id", "stream_id"
         )