Revert "Split ratelimiters in two (one for events, one for registration)"

This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db.

3 files changed, 3 insertions, 3 deletions

diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py

index a2212e2023..d8d86d6ff3 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -44,7 +44,7 @@ class BaseHandler(object):
         self.notifier = hs.get_notifier()
         self.state_handler = hs.get_state_handler()
         self.distributor = hs.get_distributor()
-        self.ratelimiter = hs.get_events_ratelimiter()
+        self.ratelimiter = hs.get_ratelimiter()
         self.clock = hs.get_clock()
         self.hs = hs
 
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index 120aa0d017..c762b58902 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -224,7 +224,7 @@ class EventCreationHandler(object):
         self.profile_handler = hs.get_profile_handler()
         self.event_builder_factory = hs.get_event_builder_factory()
         self.server_name = hs.hostname
-        self.ratelimiter = hs.get_events_ratelimiter()
+        self.ratelimiter = hs.get_ratelimiter()
         self.notifier = hs.get_notifier()
         self.config = hs.config
 
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py

index 03130edc54..47d5e276f8 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -61,7 +61,7 @@ class RegistrationHandler(BaseHandler):
         self.user_directory_handler = hs.get_user_directory_handler()
         self.captcha_client = CaptchaServerHttpClient(hs)
         self.identity_handler = self.hs.get_handlers().identity_handler
-        self.ratelimiter = hs.get_registration_ratelimiter()
+        self.ratelimiter = hs.get_ratelimiter()
 
         self._next_generated_user_id = None