arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 04:18:10 +00:00
Code Issues Releases Wiki Activity

refactor(python): make client.model not optional

Browse Source
This commit is contained in:
matejcik 2023-10-17 12:02:40 +02:00
parent 9b9ce11395
commit 4ed8f3494d
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python/src/trezorlib/client.py
View File

@ -80,6 +80,12 @@ class TrezorClient(Generic[UI]):
(send a cancel message, initialize or clear a session, ping the device). (send a cancel message, initialize or clear a session, ping the device).
""" """
model: models.TrezorModel
transport: "Transport"
session_id: Optional[bytes]
ui: UI
features: messages.Features
def __init__( def __init__(
self, self,
transport: "Transport", transport: "Transport",
@ -115,7 +121,9 @@ class TrezorClient(Generic[UI]):
might be removed at any time. might be removed at any time.
""" """
LOG.info(f"creating client instance for device: {transport.get_path()}") LOG.info(f"creating client instance for device: {transport.get_path()}")
self.model = model # Here, self.model could be set to None. Unless _init_device is False, it will
# get correctly reconfigured as part of the init_device flow.
self.model = model # type: ignore [Type "None" cannot be assigned]
if self.model: if self.model:
self.mapping = self.model.default_mapping self.mapping = self.model.default_mapping
else: else:
@ -266,11 +274,12 @@ class TrezorClient(Generic[UI]):
if not self.model: if not self.model:
# Trezor Model One bootloader 1.8.0 or older does not send model name # Trezor Model One bootloader 1.8.0 or older does not send model name
self.model = models.by_internal_name(features.internal_model) model = models.by_internal_name(features.internal_model)
if self.model is None: if model is None:
self.model = models.by_name(features.model or "1") model = models.by_name(features.model or "1")
if self.model is None: if model is None:
raise RuntimeError("Unsupported Trezor model") raise RuntimeError("Unsupported Trezor model")
self.model = model
if features.vendor not in self.model.vendors: if features.vendor not in self.model.vendors:
raise RuntimeError("Unsupported device") raise RuntimeError("Unsupported device")
@ -371,8 +380,6 @@ class TrezorClient(Generic[UI]):
def is_outdated(self) -> bool: def is_outdated(self) -> bool:
if self.features.bootloader_mode: if self.features.bootloader_mode:
return False return False
assert self.model is not None # should happen in _refresh_features
return self.version < self.model.minimum_version return self.version < self.model.minimum_version
def check_firmware_version(self, warn_only: bool = False) -> None: def check_firmware_version(self, warn_only: bool = False) -> None: