From af3d81682bd30add33a8434118fa04f44f74c626 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Wed, 14 Feb 2024 15:42:29 +0100 Subject: [PATCH] Mock resampler: Improve variable names Since the mock resampler uses a pair of channels, one to receive samples to be (fakely) resampled (input) and one to send the (fakely) resampmled samples (output), we should use clear names to identify both otherwise is really hard to follow which is which when reading the code. Signed-off-by: Leandro Lucarella --- tests/timeseries/mock_resampler.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/timeseries/mock_resampler.py b/tests/timeseries/mock_resampler.py index c2cbfd9cc..5d19ab0eb 100644 --- a/tests/timeseries/mock_resampler.py +++ b/tests/timeseries/mock_resampler.py @@ -45,7 +45,7 @@ def __init__( # pylint: disable=too-many-arguments self._resampler_request_channel = Broadcast[ComponentMetricRequest]( "resampler-request" ) - self._basic_receivers: dict[str, list[Receiver[Sample[Quantity]]]] = {} + self._input_channels_receivers: dict[str, list[Receiver[Sample[Quantity]]]] = {} def power_senders( comp_ids: list[int], @@ -58,7 +58,7 @@ def power_senders( Sample[Quantity], name ).new_sender() ) - self._basic_receivers[name] = [ + self._input_channels_receivers[name] = [ self._channel_registry.get_or_create( Sample[Quantity], name ).new_receiver() @@ -77,7 +77,7 @@ def frequency_senders( Sample[Quantity], name ).new_sender() ) - self._basic_receivers[name] = [ + self._input_channels_receivers[name] = [ self._channel_registry.get_or_create( Sample[Quantity], name ).new_receiver(name) @@ -119,19 +119,19 @@ def multi_phase_senders( ).new_sender(), ] ) - self._basic_receivers[p1_name] = [ + self._input_channels_receivers[p1_name] = [ self._channel_registry.get_or_create( Sample[Quantity], p1_name ).new_receiver() for _ in range(namespaces) ] - self._basic_receivers[p2_name] = [ + self._input_channels_receivers[p2_name] = [ self._channel_registry.get_or_create( Sample[Quantity], p2_name ).new_receiver() for _ in range(namespaces) ] - self._basic_receivers[p3_name] = [ + self._input_channels_receivers[p3_name] = [ self._channel_registry.get_or_create( Sample[Quantity], p3_name ).new_receiver() @@ -222,15 +222,18 @@ async def _handle_resampling_requests(self) -> None: name = request.get_channel_name() if name in self._forward_tasks: continue - basic_recv_name = f"{request.component_id}:{request.metric_id}" - recv = self._basic_receivers[basic_recv_name].pop() - assert recv is not None + input_chan_recv_name = f"{request.component_id}:{request.metric_id}" + input_chan_recv = self._input_channels_receivers[input_chan_recv_name].pop() + assert input_chan_recv is not None + output_chan_sender: Sender[Sample[Quantity]] = ( + self._channel_registry.get_or_create( + Sample[Quantity], name + ).new_sender() + ) task = asyncio.create_task( self._channel_forward_messages( - recv, - self._channel_registry.get_or_create( - Sample[Quantity], name - ).new_sender(), + input_chan_recv, + output_chan_sender, ), name=name, )