From e29b3009256648119fd61d74024514c0fce4d220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Wed, 28 Feb 2018 15:57:44 +0100
Subject: [PATCH] Refactor ServerUplinkConnector to avoid passing redundant
 data

---
 lib/tfw/components/directory_monitor.py               | 3 +--
 lib/tfw/components/process_managing_event_handler.py  | 3 +--
 lib/tfw/message_sender.py                             | 5 +----
 lib/tfw/networking/event_handlers/server_connector.py | 1 +
 lib/tfw/networking/server/tfw_server.py               | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/tfw/components/directory_monitor.py b/lib/tfw/components/directory_monitor.py
index 5234367..6d2d264 100644
--- a/lib/tfw/components/directory_monitor.py
+++ b/lib/tfw/components/directory_monitor.py
@@ -25,8 +25,7 @@ class WebideReloadEventHandler(FileSystemEventHandler):
         if self._paused: return
         log.debug(event)
         key = 'webide'
-        self.uplink.send(key, {'key': key,
-                               'data': {'command': 'reload'}})
+        self.uplink.send(key, {'data': {'command': 'reload'}})
 
 
 class DirectoryMonitor:
diff --git a/lib/tfw/components/process_managing_event_handler.py b/lib/tfw/components/process_managing_event_handler.py
index 8084382..ec20fce 100644
--- a/lib/tfw/components/process_managing_event_handler.py
+++ b/lib/tfw/components/process_managing_event_handler.py
@@ -25,5 +25,4 @@ class ProcessManagingEventHandler(TriggerlessEventHandler):
     def handle_event(self, key, data_json):
         data = data_json['data']
         self.processmanager(data['command'], data['process_name'])
-        self.uplink.send(self.key, {'key': self.key,
-                                    'data': {'process_name': data['process_name']}})
+        self.uplink.send(self.key, {'data': {'process_name': data['process_name']}})
diff --git a/lib/tfw/message_sender.py b/lib/tfw/message_sender.py
index 6d57aa6..fbd52fb 100644
--- a/lib/tfw/message_sender.py
+++ b/lib/tfw/message_sender.py
@@ -14,8 +14,5 @@ class MessageSender:
             'timestamp': datetime.now().isoformat(),
             'message': message
         }
-        response = {
-            'key': self.key,
-            'data': data
-        }
+        response = {'data': data}
         self.server_connector.send(self.key, response)
diff --git a/lib/tfw/networking/event_handlers/server_connector.py b/lib/tfw/networking/event_handlers/server_connector.py
index 99fe058..7c3fcb3 100644
--- a/lib/tfw/networking/event_handlers/server_connector.py
+++ b/lib/tfw/networking/event_handlers/server_connector.py
@@ -26,6 +26,7 @@ class ServerUplinkConnector(ZMQConnectorBase):
         self._zmq_push_socket.connect('tcp://localhost:{}'.format(tfwenv.RECEIVER_PORT))
 
     def send(self, key, response):
+        response['key'] = key
         self._zmq_push_socket.send_multipart(serialize_all(key, response))
 
 
diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py
index 8411bd4..39cd498 100644
--- a/lib/tfw/networking/server/tfw_server.py
+++ b/lib/tfw/networking/server/tfw_server.py
@@ -46,8 +46,7 @@ class FSMUpdater:
 
     def generate_fsm_update(self):
         key = 'FSMUpdate'
-        response = {'key': key,
-                    'data': {'current_state': self.fsm.state,
+        response = {'data': {'current_state': self.fsm.state,
                              'valid_transitions':
                                  [{'trigger': trigger} for trigger in self.fsm.machine.get_triggers(self.fsm.state)]}}
         return key, response