Move message validation code to where it belongs

lib/tfw/networking/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2018 Avatao.com Innovative Learning Kft.
 # All Rights Reserved. See LICENSE file for details.
 
-from .serialization import serialize_tfw_msg, deserialize_tfw_msg, validate_message, with_deserialize_tfw_msg
+from .serialization import serialize_tfw_msg, deserialize_tfw_msg, with_deserialize_tfw_msg
 from .zmq_connector_base import ZMQConnectorBase
 # from .controller_connector import ControllerConnector # TODO: readd once controller stuff is resolved
 from .message_sender import MessageSender

lib/tfw/networking/serialization.py

@@ -25,11 +25,6 @@ import json
 from functools import wraps
 
 
-def validate_message(message):
-    if 'key' not in message:
-        raise ValueError('Invalid TFW message format!')
-
-
 def serialize_tfw_msg(message):
     """
     Create TFW multipart data from message dict

lib/tfw/networking/server/zmq_websocket_handler.py

@@ -5,7 +5,6 @@ import json
 
 from tornado.websocket import WebSocketHandler
 
-from tfw.networking import validate_message
 from tfw.mixins import CallbackMixin
 from tfw.config.logs import logging
 
@@ -20,13 +19,18 @@ class TFWProxy:
         self.proxy_filters = CallbackMixin()
         self.proxy_callbacks = CallbackMixin()
 
-        self.proxy_filters.subscribe_callback(validate_message)
+        self.proxy_filters.subscribe_callback(self.validate_message)
 
         self.keyhandlers = {
             'mirror':    self.mirror,
             'broadcast': self.broadcast
         }
 
+    @staticmethod
+    def validate_message(message):
+        if 'key' not in message:
+            raise ValueError('Invalid TFW message format!')
+
     def __call__(self, message):
         try:
             self.proxy_filters._execute_callbacks(message)