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

This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db.

1 files changed, 3 insertions, 7 deletions

diff --git a/synapse/server.py b/synapse/server.py

index f3ca3e259a..4323e7ff12 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -205,8 +205,7 @@ class HomeServer(object):
 
         self.clock = Clock(reactor)
         self.distributor = Distributor()
-        self.events_ratelimiter = Ratelimiter()
-        self.registration_ratelimiter = Ratelimiter()
+        self.ratelimiter = Ratelimiter()
 
         self.datastore = None
 
@@ -249,11 +248,8 @@ class HomeServer(object):
     def get_distributor(self):
         return self.distributor
 
-    def get_events_ratelimiter(self):
-        return self.events_ratelimiter
-
-    def get_registration_ratelimiter(self):
-        return self.registration_ratelimiter
+    def get_ratelimiter(self):
+        return self.ratelimiter
 
     def build_federation_client(self):
         return FederationClient(self)