Rename ServerConnector interface to Connector ¯\_(ツ)_/¯

tfw/main/event_handler_factory.py

@@ -4,5 +4,5 @@ from .tfw_connector import TFWConnector
 
 
 class EventHandlerFactory(EventHandlerFactoryBase):
-    def _build_server_connector(self):
+    def _build_connector(self):
         return TFWConnector()

tfw/main/tfw_connector.py

@@ -1,4 +1,4 @@
-from tfw.internals.networking import ServerConnector, ServerUplinkConnector
+from tfw.internals.networking import ZMQConnector, ZMQUplinkConnector
 from tfw.config import TFWENV
 
 
@@ -12,12 +12,12 @@ class ConnAddrMixin:
         return f'tcp://localhost:{TFWENV.PUB_PORT}'
 
 
-class TFWUplinkConnector(ServerUplinkConnector, ConnAddrMixin):
+class TFWUplinkConnector(ZMQUplinkConnector, ConnAddrMixin):
     def __init__(self):
         super().__init__(self.uplink_conn_addr)
 
 
-class TFWConnector(ServerConnector, ConnAddrMixin):
+class TFWConnector(ZMQConnector, ConnAddrMixin):
     def __init__(self):
         super().__init__(
             self.downlink_conn_addr,

tfw/main/tfw_server.py

@@ -2,7 +2,7 @@ import logging
 
 from tornado.web import Application
 
-from tfw.internals.networking import EventHandlerConnector
+from tfw.internals.networking import ZMQListener
 from tfw.internals.server import ZMQWebSocketRouter
 from tfw.config import TFWENV
 
@@ -16,13 +16,13 @@ class TFWServer:
     SUB socket.
     """
     def __init__(self):
-        self._event_handler_connector = EventHandlerConnector(
+        self._listener = ZMQListener(
             downlink_bind_addr=f'tcp://*:{TFWENV.PULL_PORT}',
             uplink_bind_addr=f'tcp://*:{TFWENV.PUB_PORT}'
         )
         self.application = Application([(
             r'/ws', ZMQWebSocketRouter, {
-                'event_handler_connector': self._event_handler_connector,
+                'listener': self._listener,
             }
         )])