Remove unnecessary protocol abstraction

core/src/all_modules.py

@@ -205,8 +205,6 @@ trezor.wire.errors
 import trezor.wire.errors
 trezor.wire.message_handler
 import trezor.wire.message_handler
-trezor.wire.protocol
-import trezor.wire.protocol
 trezor.wire.protocol_common
 import trezor.wire.protocol_common
 trezor.wire.thp

core/src/trezor/wire/context.py

@@ -15,8 +15,8 @@ for ButtonRequests. Of course, `context.wait()` transparently works in such situ
 
 from typing import TYPE_CHECKING  # pyright: ignore[reportShadowedImports]
 
-import trezor.wire.protocol as protocol
 from trezor import log, loop, protobuf
+from trezor.wire import codec_v1
 
 from .protocol_common import Context, MessageWithId
 
@@ -74,7 +74,7 @@ class CodecContext(Context):
 
     def read_from_wire(self) -> Awaitable[MessageWithId]:
         """Read a whole message from the wire without parsing it."""
-        return protocol.read_message(self.iface, self.buffer)
+        return codec_v1.read_message(self.iface, self.buffer)
 
     if TYPE_CHECKING:
 
@@ -176,7 +176,7 @@ class CodecContext(Context):
         msg_session_id = None
         if self.channel_id is not None:
             msg_session_id = bytearray(self.channel_id)
-        await protocol.write_message(
+        await codec_v1.write_message(
             self.iface,
             MessageWithId(
                 message_type=msg.MESSAGE_WIRE_TYPE,

core/src/trezor/wire/protocol.py

@@ -1,21 +0,0 @@
-from typing import TYPE_CHECKING  # pyright: ignore[reportShadowedImports]
-
-from trezor import utils
-from trezor.wire import codec_v1
-from trezor.wire.protocol_common import MessageWithId
-
-if TYPE_CHECKING:
-    from trezorio import WireInterface  # pyright: ignore[reportMissingImports]
-
-
-async def read_message(iface: WireInterface, buffer: utils.BufferType) -> MessageWithId:
-    if utils.USE_THP:
-        raise Exception("THP protocol should be used instead")
-    return await codec_v1.read_message(iface, buffer)
-
-
-async def write_message(iface: WireInterface, message: MessageWithId) -> None:
-    if utils.USE_THP:
-        raise Exception("THP protocol should be used instead")
-    await codec_v1.write_message(iface, message.type, message.data)
-    return