diff --git a/repeater/engine.py b/repeater/engine.py index ecfcbd4..a909ac4 100644 --- a/repeater/engine.py +++ b/repeater/engine.py @@ -1141,9 +1141,7 @@ class RepeaterHandler(BaseHandler): return False try: - sent = await self.dispatcher.send_packet( - fwd_pkt, wait_for_ack=False - ) + sent = await self.dispatcher.send_packet(fwd_pkt, wait_for_ack=False) if not sent: logger.warning( "Retransmit failed (attempt %d): dispatcher returned false", diff --git a/repeater/packet_router.py b/repeater/packet_router.py index 3f2e3e7..5d2a6da 100644 --- a/repeater/packet_router.py +++ b/repeater/packet_router.py @@ -172,9 +172,7 @@ class PacketRouter: # (avoids duty-cycle or dispatcher races where a later packet goes out first) async with self._inject_lock: # Use local_transmission=True to bypass forwarding logic - sent = await self.daemon.repeater_handler( - packet, metadata, local_transmission=True - ) + sent = await self.daemon.repeater_handler(packet, metadata, local_transmission=True) if not sent: logger.warning("Injected packet failed local transmission") return False @@ -194,9 +192,7 @@ class PacketRouter: await push_rx(raw, 0, 0.0, exclude_hash=origin_hash) servers = getattr(self.daemon, "companion_frame_servers", []) pushed = sum( - 1 - for fs in servers - if getattr(fs, "companion_hash", None) != origin_hash + 1 for fs in servers if getattr(fs, "companion_hash", None) != origin_hash ) logger.debug( "Echoed injected TX as raw RX (0x88) to %d companion client(s) " @@ -221,9 +217,7 @@ class PacketRouter: if dispatcher and hasattr(dispatcher, "wait_for_ack"): try: expected_crc = packet.get_crc() - ack_ok = await dispatcher.wait_for_ack( - expected_crc, timeout=5.0 - ) + ack_ok = await dispatcher.wait_for_ack(expected_crc, timeout=5.0) if not ack_ok: logger.warning( "Injected packet ACK timeout (crc=%08X)", expected_crc @@ -517,8 +511,7 @@ class PacketRouter: sent = await self.daemon.repeater_handler(packet, metadata) if sent is False: logger.warning( - "Inbound packet not transmitted by repeater handler " - "(type=%s, header=0x%02x)", + "Inbound packet not transmitted by repeater handler (type=%s, header=0x%02x)", payload_type, getattr(packet, "header", 0), ) diff --git a/tests/test_engine.py b/tests/test_engine.py index c6623fa..2560ef4 100644 --- a/tests/test_engine.py +++ b/tests/test_engine.py @@ -12,7 +12,6 @@ import time from unittest.mock import AsyncMock, MagicMock, patch import pytest - from pymc_core.protocol import Packet, PacketBuilder from pymc_core.protocol.constants import ( MAX_PATH_SIZE, @@ -24,7 +23,6 @@ from pymc_core.protocol.constants import ( ROUTE_TYPE_TRANSPORT_FLOOD, ) - # --------------------------------------------------------------------------- # Helpers — build minimal config / mocks needed by RepeaterHandler.__init__ # --------------------------------------------------------------------------- @@ -1083,7 +1081,9 @@ class TestTxMode: with patch("repeater.engine.asyncio.sleep", new_callable=AsyncMock): with patch.object( - handler, "schedule_retransmit", new=AsyncMock(return_value=asyncio.create_task(_boom())) + handler, + "schedule_retransmit", + new=AsyncMock(return_value=asyncio.create_task(_boom())), ): with pytest.raises(RuntimeError, match="simulated tx failure"): await handler(pkt, {"snr": 0.0, "rssi": -80}, local_transmission=True) @@ -1102,7 +1102,9 @@ class TestTxMode: return False with patch.object( - handler, "schedule_retransmit", new=AsyncMock(return_value=asyncio.create_task(_tx_false())) + handler, + "schedule_retransmit", + new=AsyncMock(return_value=asyncio.create_task(_tx_false())), ): transmitted = await handler(pkt, {"snr": 0.0, "rssi": -80}, local_transmission=False)