diff --git a/src/server/communication/message_data.py b/src/server/communication/message_data.py index bbe3e1b..595a730 100644 --- a/src/server/communication/message_data.py +++ b/src/server/communication/message_data.py @@ -17,7 +17,6 @@ class MessageData: received_timestamp = None avg_speed = None latency = None - synthetic_latency = None payload_size = None offloading_layer_index = None layer_output = None @@ -59,16 +58,9 @@ def get_bytes_size(payload) -> int: return len(payload) @staticmethod - def get_synthetic_latency() -> float: - return 1 - - @staticmethod - def get_avg_speed( - payload_size: float, latency: float, synthetic_latency: float - ) -> float: - message_latency = latency * synthetic_latency + def get_avg_speed(payload_size: float, latency: float) -> float: try: - avg_speed = payload_size / message_latency + avg_speed = payload_size / latency except ZeroDivisionError: avg_speed = 0 return avg_speed diff --git a/src/server/communication/request_handler.py b/src/server/communication/request_handler.py index 37e3439..42cdfca 100644 --- a/src/server/communication/request_handler.py +++ b/src/server/communication/request_handler.py @@ -858,14 +858,12 @@ def _extend_message_data( # update stats info message_data.received_timestamp = received_timestamp message_data.payload_size = MessageData.get_bytes_size(payload) - message_data.synthetic_latency = MessageData.get_synthetic_latency() message_data.latency = MessageData.get_latency( message_data.timestamp, message_data.received_timestamp ) message_data.avg_speed = MessageData.get_avg_speed( message_data.payload_size, message_data.latency, - message_data.synthetic_latency, ) # update offloading info ( diff --git a/tests/unit/test_message_data.py b/tests/unit/test_message_data.py index 1a0789d..099ce0f 100644 --- a/tests/unit/test_message_data.py +++ b/tests/unit/test_message_data.py @@ -14,3 +14,29 @@ def test_get_latency_annotation_matches_return_type(): annotations = get_type_hints(MessageData.get_latency) assert annotations["return"] is float + + +def test_get_avg_speed_divides_payload_size_by_latency(): + avg_speed = MessageData.get_avg_speed(payload_size=100.0, latency=2.0) + + assert avg_speed == 50.0 + + +def test_get_avg_speed_handles_zero_latency(): + avg_speed = MessageData.get_avg_speed(payload_size=100.0, latency=0.0) + + assert avg_speed == 0 + + +def test_get_synthetic_latency_placeholder_was_removed(): + message_data = MessageData( + topic="t", + payload="p", + device_id=1, + message_id=1, + message_content="{}", + timestamp="0", + ) + + assert not hasattr(MessageData, "get_synthetic_latency") + assert not hasattr(message_data, "synthetic_latency")