Merge pull request #2978 from matrix-org/erikj/refactor_replication_l…

…ayer

Remove ReplicationLayer and user Client/Server directly

synapse/app/homeserver.py

@@ -348,7 +348,7 @@ def start():
         hs.get_state_handler().start_caching()
         hs.get_datastore().start_profiling()
         hs.get_datastore().start_doing_background_updates()
-        hs.get_replication_client().start_get_pdu_cache()
+        hs.get_federation_client().start_get_pdu_cache()
 
         register_memory_metrics(hs)
 

synapse/federation/transport/server.py

@@ -1190,7 +1190,7 @@ def on_POST(self, origin, content, query):
 def register_servlets(hs, resource, authenticator, ratelimiter):
     for servletclass in FEDERATION_SERVLET_CLASSES:
         servletclass(
-            handler=hs.get_replication_server(),
+            handler=hs.get_federation_server(),
             authenticator=authenticator,
             ratelimiter=ratelimiter,
             server_name=hs.hostname,

synapse/handlers/device.py

@@ -431,7 +431,7 @@ class DeviceListEduUpdater(object):
 
     def __init__(self, hs, device_handler):
         self.store = hs.get_datastore()
-        self.federation = hs.get_replication_client()
+        self.federation = hs.get_federation_client()
         self.clock = hs.get_clock()
         self.device_handler = device_handler
 

synapse/handlers/directory.py

@@ -36,7 +36,7 @@ def __init__(self, hs):
         self.appservice_handler = hs.get_application_service_handler()
         self.event_creation_handler = hs.get_event_creation_handler()
 
-        self.federation = hs.get_replication_client()
+        self.federation = hs.get_federation_client()
         hs.get_federation_registry().register_query_handler(
             "directory", self.on_directory_query
         )

synapse/handlers/e2e_keys.py

@@ -32,7 +32,7 @@
 class E2eKeysHandler(object):
     def __init__(self, hs):
         self.store = hs.get_datastore()
-        self.federation = hs.get_replication_client()
+        self.federation = hs.get_federation_client()
         self.device_handler = hs.get_device_handler()
         self.is_mine = hs.is_mine
         self.clock = hs.get_clock()

synapse/handlers/federation.py

@@ -68,7 +68,7 @@ def __init__(self, hs):
         self.hs = hs
 
         self.store = hs.get_datastore()
-        self.replication_layer = hs.get_replication_client()
+        self.replication_layer = hs.get_federation_client()
         self.state_handler = hs.get_state_handler()
         self.server_name = hs.hostname
         self.keyring = hs.get_keyring()

synapse/handlers/profile.py

@@ -31,7 +31,7 @@ class ProfileHandler(BaseHandler):
     def __init__(self, hs):
         super(ProfileHandler, self).__init__(hs)
 
-        self.federation = hs.get_replication_client()
+        self.federation = hs.get_federation_client()
         hs.get_federation_registry().register_query_handler(
             "profile", self.on_profile_query
         )

synapse/handlers/room_list.py

@@ -409,7 +409,7 @@ def get_remote_public_room_list(self, server_name, limit=None, since_token=None,
     def _get_remote_list_cached(self, server_name, limit=None, since_token=None,
                                 search_filter=None, include_all_networks=False,
                                 third_party_instance_id=None,):
-        repl_layer = self.hs.get_replication_client()
+        repl_layer = self.hs.get_federation_client()
         if search_filter:
             # We can't cache when asking for search
             return repl_layer.get_public_rooms(

synapse/server.py

@@ -101,8 +101,8 @@ def build_DEPENDENCY(self)
     DEPENDENCIES = [
         'http_client',
         'db_pool',
-        'replication_client',
-        'replication_server',
+        'federation_client',
+        'federation_server',
         'handlers',
         'v1auth',
         'auth',
@@ -199,10 +199,10 @@ def get_distributor(self):
     def get_ratelimiter(self):
         return self.ratelimiter
 
-    def build_replication_client(self):
+    def build_federation_client(self):
         return FederationClient(self)
 
-    def build_replication_server(self):
+    def build_federation_server(self):
         return FederationServer(self)
 
     def build_handlers(self):

tests/handlers/test_directory.py

@@ -47,7 +47,7 @@ def register_query_handler(query_type, handler):
         hs = yield setup_test_homeserver(
             http_client=None,
             resource_for_federation=Mock(),
-            replication_client=self.mock_federation,
+            federation_client=self.mock_federation,
             federation_registry=self.mock_registry,
         )
         hs.handlers = DirectoryHandlers(hs)

tests/handlers/test_e2e_keys.py

@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
     def setUp(self):
         self.hs = yield utils.setup_test_homeserver(
             handlers=None,
-            replication_client=mock.Mock(),
+            federation_client=mock.Mock(),
         )
         self.handler = synapse.handlers.e2e_keys.E2eKeysHandler(self.hs)
 

tests/handlers/test_profile.py

@@ -51,8 +51,8 @@ def register_query_handler(query_type, handler):
             http_client=None,
             handlers=None,
             resource_for_federation=Mock(),
-            replication_client=self.mock_federation,
-            replication_server=Mock(),
+            federation_client=self.mock_federation,
+            federation_server=Mock(),
             federation_registry=self.mock_registry,
             ratelimiter=NonCallableMock(spec_set=[
                 "send_message",

tests/replication/slave/storage/_base.py

@@ -31,7 +31,7 @@ def setUp(self):
         self.hs = yield setup_test_homeserver(
             "blue",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=[
                 "send_message",
             ]),

tests/rest/client/v1/test_events.py

@@ -114,7 +114,7 @@ def setUp(self):
 
         hs = yield setup_test_homeserver(
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=[
                 "send_message",
             ]),

tests/rest/client/v1/test_profile.py

@@ -45,7 +45,7 @@ def setUp(self):
             http_client=None,
             resource_for_client=self.mock_resource,
             federation=Mock(),
-            replication_client=Mock(),
+            federation_client=Mock(),
             profile_handler=self.mock_handler
         )
 

tests/rest/client/v1/test_rooms.py

@@ -46,7 +46,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=["send_message"]),
         )
         self.ratelimiter = hs.get_ratelimiter()
@@ -409,7 +409,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=["send_message"]),
         )
         self.ratelimiter = hs.get_ratelimiter()
@@ -493,7 +493,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=["send_message"]),
         )
         self.ratelimiter = hs.get_ratelimiter()
@@ -582,7 +582,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=["send_message"]),
         )
         self.ratelimiter = hs.get_ratelimiter()
@@ -697,7 +697,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=["send_message"]),
         )
         self.ratelimiter = hs.get_ratelimiter()
@@ -829,7 +829,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=["send_message"]),
         )
         self.ratelimiter = hs.get_ratelimiter()
@@ -929,7 +929,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=[
                 "send_message",
             ]),
@@ -1003,7 +1003,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             "red",
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=["send_message"]),
         )
         self.ratelimiter = hs.get_ratelimiter()

tests/rest/client/v1/test_typing.py

@@ -47,7 +47,7 @@ def setUp(self):
             "red",
             clock=self.clock,
             http_client=None,
-            replication_client=Mock(),
+            federation_client=Mock(),
             ratelimiter=NonCallableMock(spec_set=[
                 "send_message",
             ]),

tests/storage/test_appservice.py

@@ -42,7 +42,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             config=config,
             federation_sender=Mock(),
-            replication_client=Mock(),
+            federation_client=Mock(),
         )
 
         self.as_token = "token1"
@@ -119,7 +119,7 @@ def setUp(self):
         hs = yield setup_test_homeserver(
             config=config,
             federation_sender=Mock(),
-            replication_client=Mock(),
+            federation_client=Mock(),
         )
         self.db_pool = hs.get_db_pool()
 
@@ -455,7 +455,7 @@ def test_unique_works(self):
             config=config,
             datastore=Mock(),
             federation_sender=Mock(),
-            replication_client=Mock(),
+            federation_client=Mock(),
         )
 
         ApplicationServiceStore(None, hs)
@@ -473,7 +473,7 @@ def test_duplicate_ids(self):
             config=config,
             datastore=Mock(),
             federation_sender=Mock(),
-            replication_client=Mock(),
+            federation_client=Mock(),
         )
 
         with self.assertRaises(ConfigError) as cm:
@@ -497,7 +497,7 @@ def test_duplicate_as_tokens(self):
             config=config,
             datastore=Mock(),
             federation_sender=Mock(),
-            replication_client=Mock(),
+            federation_client=Mock(),
         )
 
         with self.assertRaises(ConfigError) as cm: