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
This commit is contained in:
Richard van der Hoff 2022-02-23 11:04:02 +00:00 committed by GitHub
parent c1ac2a8135
commit e24ff8ebe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
230 changed files with 526 additions and 500 deletions

View file

@ -123,7 +123,7 @@ class EmailRegisterRequestTokenRestServlet(RestServlet):
request, "email", email
)
existing_user_id = await self.hs.get_datastore().get_user_id_by_threepid(
existing_user_id = await self.hs.get_datastores().main.get_user_id_by_threepid(
"email", email
)
@ -203,7 +203,7 @@ class MsisdnRegisterRequestTokenRestServlet(RestServlet):
request, "msisdn", msisdn
)
existing_user_id = await self.hs.get_datastore().get_user_id_by_threepid(
existing_user_id = await self.hs.get_datastores().main.get_user_id_by_threepid(
"msisdn", msisdn
)
@ -258,7 +258,7 @@ class RegistrationSubmitTokenServlet(RestServlet):
self.auth = hs.get_auth()
self.config = hs.config
self.clock = hs.get_clock()
self.store = hs.get_datastore()
self.store = hs.get_datastores().main
if self.config.email.threepid_behaviour_email == ThreepidBehaviour.LOCAL:
self._failure_email_template = (
@ -385,7 +385,7 @@ class RegistrationTokenValidityRestServlet(RestServlet):
def __init__(self, hs: "HomeServer"):
super().__init__()
self.hs = hs
self.store = hs.get_datastore()
self.store = hs.get_datastores().main
self.ratelimiter = Ratelimiter(
store=self.store,
clock=hs.get_clock(),
@ -415,7 +415,7 @@ class RegisterRestServlet(RestServlet):
self.hs = hs
self.auth = hs.get_auth()
self.store = hs.get_datastore()
self.store = hs.get_datastores().main
self.auth_handler = hs.get_auth_handler()
self.registration_handler = hs.get_registration_handler()
self.identity_handler = hs.get_identity_handler()