From ba6b24e5b2c703f9a7040c60b9a033ef99184d9c Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Tue, 12 Sep 2023 12:13:35 +0200 Subject: [PATCH] fixup! STM --- core/site_scons/boards/trezor_t3w1_d1.py | 1 - core/src/apps/management/ble/comparison_request.py | 9 ++------- core/src/apps/management/ble/disconnect.py | 9 ++------- core/src/apps/management/ble/erase_bonds.py | 9 ++------- core/src/apps/management/ble/pairing_request.py | 9 ++------- core/src/apps/management/ble/repair_request.py | 9 ++------- .../apps/management/ble/upload_ble_firmware_init.py | 12 ++++-------- 7 files changed, 14 insertions(+), 44 deletions(-) diff --git a/core/site_scons/boards/trezor_t3w1_d1.py b/core/site_scons/boards/trezor_t3w1_d1.py index 6dc825bd3e..faaae92e9e 100644 --- a/core/site_scons/boards/trezor_t3w1_d1.py +++ b/core/site_scons/boards/trezor_t3w1_d1.py @@ -56,7 +56,6 @@ def configure( sources += ["embed/extmod/modtrezorio/ffunicode.c"] features_available.append("sd_card") - if "ble" in features_wanted: sources += ["embed/trezorhal/stm32f4/ble.c"] sources += ["embed/lib/ble/dfu.c"] diff --git a/core/src/apps/management/ble/comparison_request.py b/core/src/apps/management/ble/comparison_request.py index 4194e35f0e..d0af14d38e 100644 --- a/core/src/apps/management/ble/comparison_request.py +++ b/core/src/apps/management/ble/comparison_request.py @@ -1,16 +1,11 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from trezor.messages import ( - Success, - ComparisonRequest, - ) + from trezor.messages import ComparisonRequest, Success async def comparison_request(msg: ComparisonRequest) -> Success: - from trezor.messages import ( - Success, - ) + from trezor.messages import Success from trezor.ui.layouts import confirm_action await confirm_action( diff --git a/core/src/apps/management/ble/disconnect.py b/core/src/apps/management/ble/disconnect.py index e44f397f28..758d00ea57 100644 --- a/core/src/apps/management/ble/disconnect.py +++ b/core/src/apps/management/ble/disconnect.py @@ -2,16 +2,11 @@ from trezorio import ble from typing import TYPE_CHECKING if TYPE_CHECKING: - from trezor.messages import ( - Success, - Disconnect, - ) + from trezor.messages import Disconnect, Success async def disconnect(_msg: Disconnect) -> Success: - from trezor.messages import ( - Success, - ) + from trezor.messages import Success from trezor.ui.layouts import confirm_action await confirm_action(None, "DISCONNECT") diff --git a/core/src/apps/management/ble/erase_bonds.py b/core/src/apps/management/ble/erase_bonds.py index 0a22735bba..37e05df546 100644 --- a/core/src/apps/management/ble/erase_bonds.py +++ b/core/src/apps/management/ble/erase_bonds.py @@ -2,16 +2,11 @@ from trezorio import ble from typing import TYPE_CHECKING if TYPE_CHECKING: - from trezor.messages import ( - Success, - EraseBonds, - ) + from trezor.messages import EraseBonds, Success async def erase_bonds(_msg: EraseBonds) -> Success: - from trezor.messages import ( - Success, - ) + from trezor.messages import Success from trezor.ui.layouts import confirm_action await confirm_action(None, "ERASE BONDS") diff --git a/core/src/apps/management/ble/pairing_request.py b/core/src/apps/management/ble/pairing_request.py index e61b8bc3c5..3c563cafd1 100644 --- a/core/src/apps/management/ble/pairing_request.py +++ b/core/src/apps/management/ble/pairing_request.py @@ -1,16 +1,11 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from trezor.messages import ( - AuthKey, - PairingRequest, - ) + from trezor.messages import AuthKey, PairingRequest async def pairing_request(_msg: PairingRequest) -> AuthKey: - from trezor.messages import ( - AuthKey, - ) + from trezor.messages import AuthKey from trezor.ui.layouts import request_pin_on_device pin = await request_pin_on_device("PAIRING", None, True, False, True) diff --git a/core/src/apps/management/ble/repair_request.py b/core/src/apps/management/ble/repair_request.py index 1d30446bda..33784c6b3e 100644 --- a/core/src/apps/management/ble/repair_request.py +++ b/core/src/apps/management/ble/repair_request.py @@ -1,16 +1,11 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from trezor.messages import ( - Success, - RepairRequest, - ) + from trezor.messages import RepairRequest, Success async def repair_request(_msg: RepairRequest) -> Success: - from trezor.messages import ( - Success, - ) + from trezor.messages import Success from trezor.ui.layouts import confirm_action await confirm_action(None, "RE-PAIR DEVICE") diff --git a/core/src/apps/management/ble/upload_ble_firmware_init.py b/core/src/apps/management/ble/upload_ble_firmware_init.py index 8ef8f0a5ba..5d9ce10973 100644 --- a/core/src/apps/management/ble/upload_ble_firmware_init.py +++ b/core/src/apps/management/ble/upload_ble_firmware_init.py @@ -2,11 +2,7 @@ from trezorio import ble from typing import TYPE_CHECKING if TYPE_CHECKING: - from trezor.messages import ( - UploadBLEFirmwareInit, - UploadBLEFirmwareChunk, - Success, - ) + from trezor.messages import Success, UploadBLEFirmwareChunk, UploadBLEFirmwareInit async def upload_ble_firmware_chunk(msg: UploadBLEFirmwareChunk) -> int: @@ -18,9 +14,9 @@ async def upload_ble_firmware_chunk(msg: UploadBLEFirmwareChunk) -> int: async def upload_ble_firmware_init(msg: UploadBLEFirmwareInit) -> Success: from trezor.enums import ButtonRequestType from trezor.messages import ( - UploadBLEFirmwareNextChunk, - UploadBLEFirmwareChunk, Success, + UploadBLEFirmwareChunk, + UploadBLEFirmwareNextChunk, ) from trezor.ui.layouts import confirm_action @@ -34,9 +30,9 @@ async def upload_ble_firmware_init(msg: UploadBLEFirmwareInit) -> Success: br_code=ButtonRequestType.Other, ) + from trezor.enums import MessageType from trezor.ui.layouts import progress from trezor.wire.context import get_context - from trezor.enums import MessageType ctx = get_context()