diff --git a/src/adn_server/application/proxy/use_cases.py b/src/adn_server/application/proxy/use_cases.py index ada6aaf..fe869b5 100644 --- a/src/adn_server/application/proxy/use_cases.py +++ b/src/adn_server/application/proxy/use_cases.py @@ -27,7 +27,7 @@ from collections.abc import Sequence from adn_server.application.ports import PendingRptoQueue, ProxyIpBlacklist, ProxySlotStore from adn_server.domain.errors import DomainError -from adn_server.domain.proxy import ClientEndpoint, ClientSlot, PendingRpto, SessionTeardown +from adn_server.domain.proxy import ClientEndpoint, ClientSlot, SessionTeardown from adn_server.domain.result import Fail, Result, Success from adn_server.domain.value_objects import int_id diff --git a/tests/application/test_peer_single_downlink.py b/tests/application/test_peer_single_downlink.py index 5c6686e..654e591 100644 --- a/tests/application/test_peer_single_downlink.py +++ b/tests/application/test_peer_single_downlink.py @@ -25,7 +25,6 @@ from __future__ import annotations from adn_server.application.routing.helpers import ( clear_peer_rx_status_slots, clear_peer_ua_sessions, - peer_hotspot_voice_slot_busy, peer_options_static_tg_slot, peer_receives_group_tgid, peer_should_receive_group_voice, diff --git a/tests/application/test_proxy_use_cases.py b/tests/application/test_proxy_use_cases.py index 37fe8d0..8d8e6eb 100644 --- a/tests/application/test_proxy_use_cases.py +++ b/tests/application/test_proxy_use_cases.py @@ -28,8 +28,7 @@ import pytest from adn_server.application.proxy import ProxyUseCases, peer_id_from_packet from adn_server.domain.proxy import ClientEndpoint -from adn_server.domain.result import is_fail -from adn_server.domain.result import Success +from adn_server.domain.result import Success, is_fail from adn_server.domain.value_objects import bytes_4 from adn_server.infrastructure.proxy import InMemoryPendingRptoQueue, InMemoryProxySlotStore diff --git a/tests/application/test_routing_table_legacy_view.py b/tests/application/test_routing_table_legacy_view.py index 608430a..41b7fe4 100644 --- a/tests/application/test_routing_table_legacy_view.py +++ b/tests/application/test_routing_table_legacy_view.py @@ -24,7 +24,6 @@ from __future__ import annotations from adn_server.application.subscription.routing_table_export import export_routing_table from adn_server.application.subscription.routing_table_legacy_view import RoutingTableLegacyView -from adn_server.domain import bytes_3 from adn_server.domain.subscription import ( ActivationPolicy, AudioChannel, diff --git a/tests/application/test_subscription_table_store_ops.py b/tests/application/test_subscription_table_store_ops.py index 9924654..058604e 100644 --- a/tests/application/test_subscription_table_store_ops.py +++ b/tests/application/test_subscription_table_store_ops.py @@ -116,6 +116,7 @@ def test_master_dynamic_tg_slots_expired_single() -> None: def test_apply_static_tg_to_bridge_activates_dynamic_tg() -> None: """A dynamic TG not in OPTIONS is activated when a peer has an active UA session for it.""" from tests.harness.deterministic import DeterministicScenario, add_openbridge_system + from adn_server.domain import bytes_4 config = minimal_config(("MASTER-A",)) diff --git a/tests/infrastructure/mesh/test_obp_v1.py b/tests/infrastructure/mesh/test_obp_v1.py index e05e5df..7af4318 100644 --- a/tests/infrastructure/mesh/test_obp_v1.py +++ b/tests/infrastructure/mesh/test_obp_v1.py @@ -24,13 +24,13 @@ from __future__ import annotations from adn_server.domain import bytes_4 from adn_server.infrastructure.hbp_constants import BCKA, BCSQ, BCST, BCVE, DMRD -from adn_server.infrastructure.mesh.obp_v1 import obp_hmac_sha1 from adn_server.infrastructure.mesh.obp_v1 import ( DMRD_V1_WIRE_LEN, build_bcka, build_bcsq, build_bcve, build_dmrd_v1, + obp_hmac_sha1, verify_bcka, verify_bcsq, verify_bcst,