arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-22 16:58:49 +00:00
Code Issues Releases Wiki Activity

fix(python): simplify UI callbacks

Browse Source
This commit is contained in:
Martin Milata 2025-02-27 18:49:04 +01:00 committed by M1nd3r
parent 59a13c06d4
commit 1aa7371995
1 changed files with 72 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
python/src/trezorlib/debuglink.py
View File

@ -1076,9 +1076,6 @@ class SessionDebugWrapper(Session):
t.Type[protobuf.MessageType],
t.Callable[[protobuf.MessageType], protobuf.MessageType] | None,
] = {}
self.button_callback = self.client.button_callback
self.pin_callback = self.client.pin_callback
self.passphrase_callback = self._session.passphrase_callback
def __enter__(self) -> "SessionDebugWrapper":
# For usage in with/expected_responses
@ -1241,22 +1238,14 @@ class TrezorClientDebugLink(TrezorClient):
self.ui: DebugUI = DebugUI(self.debug)
self.in_with_statement = False
@property
def button_callback(self):
def _callback_button(session: Session, msg: messages.ButtonRequest) -> t.Any:
def button_callback(self, session: Session, msg: messages.ButtonRequest) -> t.Any:
__tracebackhide__ = True # for pytest # pylint: disable=W0612
# do this raw - send ButtonAck first, notify UI later
session._write(messages.ButtonAck())
self.ui.button_request(msg)
return session._read()
return _callback_button
@property
def pin_callback(self):
def _callback_pin(session: Session, msg: messages.PinMatrixRequest) -> t.Any:
def pin_callback(self, session: Session, msg: messages.PinMatrixRequest) -> t.Any:
try:
pin = self.ui.get_pin(msg.type)
except Cancelled:
@ -1278,12 +1267,8 @@ class TrezorClientDebugLink(TrezorClient):
else:
return resp
return _callback_pin
@property
def passphrase_callback(self):
def _callback_passphrase(
session: Session, msg: messages.PassphraseRequest
def passphrase_callback(
self, session: Session, msg: messages.PassphraseRequest
) -> t.Any:
available_on_device = (
Capability.PassphraseEntry in session.features.capabilities
@ -1336,8 +1321,6 @@ class TrezorClientDebugLink(TrezorClient):
return send_passphrase(passphrase, on_device=False)
return _callback_passphrase
def close_transport(self) -> None:
self.transport.close()
self.debug.close()