Ensure that get_datastores().main is typed

Signed-off-by: Sean Quah <seanq@element.io>
matrix-org · Feb 23, 2022 · 0f25916 · 0f25916
1 parent 9fdbad0
commit 0f25916
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelog.d/12070.misc b/changelog.d/12070.misc
@@ -0,0 +1 @@
+Remove legacy `HomeServer.get_datastore()`.
diff --git a/synapse/storage/databases/__init__.py b/synapse/storage/databases/__init__.py
@@ -24,6 +24,7 @@
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
+    from synapse.storage.databases.main import DataStore
 
 logger = logging.getLogger(__name__)
 
@@ -44,7 +45,7 @@ class Databases(Generic[DataStoreT]):
     """
 
     databases: List[DatabasePool]
-    main: DataStoreT
+    main: "DataStore"  # FIXME: #11165: actually an instance of `main_store_class`
     state: StateGroupDataStore
     persist_events: Optional[PersistEventsStore]