Remove `HomeServer.get_datastore()` (#12031)
The presence of this method was confusing, and mostly present for backwards
compatibility. Let's get rid of it.
Part of #11733
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/replication/tcp/streams/test_account_data.py b/tests/replication/tcp/streams/test_account_data.py
index cdd052001b..50fbff5f32 100644
--- a/tests/replication/tcp/streams/test_account_data.py
+++ b/tests/replication/tcp/streams/test_account_data.py
@@ -23,7 +23,7 @@ from tests.replication._base import BaseStreamTestCase
class AccountDataStreamTestCase(BaseStreamTestCase):
def test_update_function_room_account_data_limit(self):
"""Test replication with many room account data updates"""
- store = self.hs.get_datastore()
+ store = self.hs.get_datastores().main
# generate lots of account data updates
updates = []
@@ -69,7 +69,7 @@ class AccountDataStreamTestCase(BaseStreamTestCase):
def test_update_function_global_account_data_limit(self):
"""Test replication with many global account data updates"""
- store = self.hs.get_datastore()
+ store = self.hs.get_datastores().main
# generate lots of account data updates
updates = []
diff --git a/tests/replication/tcp/streams/test_events.py b/tests/replication/tcp/streams/test_events.py
index f198a94887..f9d5da723c 100644
--- a/tests/replication/tcp/streams/test_events.py
+++ b/tests/replication/tcp/streams/test_events.py
@@ -136,7 +136,7 @@ class EventsStreamTestCase(BaseStreamTestCase):
# this is the point in the DAG where we make a fork
fork_point: List[str] = self.get_success(
- self.hs.get_datastore().get_latest_event_ids_in_room(self.room_id)
+ self.hs.get_datastores().main.get_latest_event_ids_in_room(self.room_id)
)
events = [
@@ -291,7 +291,7 @@ class EventsStreamTestCase(BaseStreamTestCase):
# this is the point in the DAG where we make a fork
fork_point: List[str] = self.get_success(
- self.hs.get_datastore().get_latest_event_ids_in_room(self.room_id)
+ self.hs.get_datastores().main.get_latest_event_ids_in_room(self.room_id)
)
events: List[EventBase] = []
diff --git a/tests/replication/tcp/streams/test_receipts.py b/tests/replication/tcp/streams/test_receipts.py
index 38e292c1ab..eb00117845 100644
--- a/tests/replication/tcp/streams/test_receipts.py
+++ b/tests/replication/tcp/streams/test_receipts.py
@@ -32,7 +32,7 @@ class ReceiptsStreamTestCase(BaseStreamTestCase):
# tell the master to send a new receipt
self.get_success(
- self.hs.get_datastore().insert_receipt(
+ self.hs.get_datastores().main.insert_receipt(
"!room:blue", "m.read", USER_ID, ["$event:blue"], {"a": 1}
)
)
@@ -56,7 +56,7 @@ class ReceiptsStreamTestCase(BaseStreamTestCase):
self.test_handler.on_rdata.reset_mock()
self.get_success(
- self.hs.get_datastore().insert_receipt(
+ self.hs.get_datastores().main.insert_receipt(
"!room2:blue", "m.read", USER_ID, ["$event2:foo"], {"a": 2}
)
)
|