Refactor ServerUplinkConnector.send() signature

lib/tfw/networking/event_handlers/server_connector.py

@@ -29,13 +29,13 @@ class ServerUplinkConnector(ZMQConnectorBase):
         self._zmq_push_socket = self._zmq_context.socket(zmq.PUSH)
         self._zmq_push_socket.connect('tcp://localhost:{}'.format(TFWENV.RECEIVER_PORT))
 
-    def send_to_eventhandler(self, key, message):
-        message['data']['key'] = key
-        self.send('mirror', message)
+    def send_to_eventhandler(self, message):
+        message['data']['key'] = message['key']
+        message['key'] = 'mirror'
+        self.send(message)
 
-    def send(self, key, message):
-        message['key'] = key
-        self._zmq_push_socket.send_multipart(serialize_all(key, message))
+    def send(self, message):
+        self._zmq_push_socket.send_multipart(serialize_all(message['key'], message))
 
 
 class ServerConnector(ServerUplinkConnector, ServerDownlinkConnector):

lib/tfw/networking/message_sender.py

@@ -17,5 +17,5 @@ class MessageSender:
             'timestamp': datetime.now().isoformat(),
             'message': message
         }
-        response = {'data': data}
-        self.server_connector.send(self.key, response)
+        self.server_connector.send({'key': self.key,
+                                    'data': data})

lib/tfw/networking/server/tfw_server.py

@@ -100,12 +100,11 @@ class FSMUpdater:
 
     def update(self, kwargs_dict):
         # pylint: disable=unused-argument
-        self.uplink.send(*self.generate_fsm_update())
+        self.uplink.send(self.generate_fsm_update())
 
     def generate_fsm_update(self):
-        key = 'FSMUpdate'
-        response = {'data': self.get_fsm_state_and_transitions()}
-        return key, response
+        return {'key': 'FSMUpdate',
+                'data': self.get_fsm_state_and_transitions()}
 
     def get_fsm_state_and_transitions(self):
         state = self.fsm.state