diff --git a/src/trezor/config.py b/src/trezor/config.py index f9df21944..6462774a0 100644 --- a/src/trezor/config.py +++ b/src/trezor/config.py @@ -2,6 +2,7 @@ from TrezorConfig import Config _config = Config() + def get(app: int, key: int) -> bytes: return _config.get(app, key) diff --git a/src/trezor/crypto/der.py b/src/trezor/crypto/der.py index 6019116e1..a6e1bc618 100644 --- a/src/trezor/crypto/der.py +++ b/src/trezor/crypto/der.py @@ -1,12 +1,14 @@ + def encode_length(l: int) -> bytes: if l < 0x80: - return bytes([l]) + return bytes([l]) elif l <= 0xFF: - return bytes([0x81, l]) + return bytes([0x81, l]) elif l <= 0xFFFF: - return bytes([0x82, l & 0xFF, l >> 8]) + return bytes([0x82, l & 0xFF, l >> 8]) else: - raise ValueError + raise ValueError + def encode_int(i: bytes) -> bytes: i = i.lstrip(b'\x00') @@ -14,6 +16,7 @@ def encode_int(i: bytes) -> bytes: i = b'\x00' + i return b'\x02' + encode_length(len(i)) + i + def encode_seq(seq: tuple) -> bytes: res = b'' for i in seq: diff --git a/src/trezor/crypto/hmac.py b/src/trezor/crypto/hmac.py index dc4db4295..db1b9916a 100644 --- a/src/trezor/crypto/hmac.py +++ b/src/trezor/crypto/hmac.py @@ -1,8 +1,3 @@ -def new(key, msg, digestmod) -> Hmac: - ''' - Creates a HMAC context object. - ''' - return Hmac(key, msg, digestmod) class Hmac: def __init__(self, key, msg, digestmod): @@ -33,3 +28,8 @@ class Hmac: return outer.digest() +def new(key, msg, digestmod) -> Hmac: + ''' + Creates a HMAC context object. + ''' + return Hmac(key, msg, digestmod) diff --git a/src/trezor/crypto/rlp.py b/src/trezor/crypto/rlp.py index 4105ddfc6..0e5ba5d2e 100644 --- a/src/trezor/crypto/rlp.py +++ b/src/trezor/crypto/rlp.py @@ -1,3 +1,4 @@ + def int_to_bytes(x: int) -> bytes: if x == 0: return b'' @@ -7,15 +8,17 @@ def int_to_bytes(x: int) -> bytes: x //= 256 return bytes(reversed(r)) + def encode_length(l: int, is_list: bool) -> bytes: offset = 0xC0 if is_list else 0x80 if l < 56: - return bytes([l + offset]) + return bytes([l + offset]) elif l < 256 ** 8: - bl = int_to_bytes(l) - return bytes([len(bl) + offset + 55]) + bl + bl = int_to_bytes(l) + return bytes([len(bl) + offset + 55]) + bl else: - raise ValueError('Input too long') + raise ValueError('Input too long') + def encode(data) -> bytes: if isinstance(data, int): diff --git a/src/trezor/ui/loader.py b/src/trezor/ui/loader.py index cce79a10f..1c53718c3 100644 --- a/src/trezor/ui/loader.py +++ b/src/trezor/ui/loader.py @@ -19,7 +19,7 @@ DEFAULT_LOADER_ACTIVE = { _LOADER_MSEC = const(1000) -class Loader(): +class Loader: def __init__(self, normal_style=None, active_style=None): self.start_ticks_ms = None diff --git a/src/trezor/ui/pin.py b/src/trezor/ui/pin.py index 028606a13..7c4f79959 100644 --- a/src/trezor/ui/pin.py +++ b/src/trezor/ui/pin.py @@ -1,8 +1,8 @@ from micropython import const -from trezor.crypto import random from trezor import ui, res -from .button import Button, BTN_CLICKED, CLEAR_BUTTON, CLEAR_BUTTON_ACTIVE -from . import display +from trezor.crypto import random +from trezor.ui import display +from treozr.ui.button import Button, BTN_CLICKED, CLEAR_BUTTON, CLEAR_BUTTON_ACTIVE def digit_area(i): diff --git a/src/trezor/ui/scroll.py b/src/trezor/ui/scroll.py index 201511794..8f408c7cc 100644 --- a/src/trezor/ui/scroll.py +++ b/src/trezor/ui/scroll.py @@ -48,5 +48,6 @@ def render_scrollbar(page, page_count): for i in range(0, page_count): if i != page: ui.display.bar_radius(x, y + i * padding, size, - size, ui.DARK_GREY, ui.BLACK, 4) - ui.display.bar_radius(x, y + page * padding, size, size, ui.WHITE, ui.BLACK, 4) + size, ui.DARK_GREY, ui.BLACK, 4) + ui.display.bar_radius(x, y + page * padding, size, + size, ui.WHITE, ui.BLACK, 4) diff --git a/src/trezor/utils.py b/src/trezor/utils.py index 2f6e958f0..4ec0d830a 100644 --- a/src/trezor/utils.py +++ b/src/trezor/utils.py @@ -16,7 +16,6 @@ def _unimport_func(func): finally: for mod in sys.modules: if mod not in mods: - log.debug(__name__, 'unimport %s', mod) del sys.modules[mod] gc.collect() return ret @@ -31,7 +30,6 @@ def _unimport_genfunc(genfunc): finally: for mod in sys.modules: if mod not in mods: - log.debug(__name__, 'unimport %s', mod) del sys.modules[mod] gc.collect() return ret