From 37f6525c15d6fd358addf2ea2eebedf75c5835a4 Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Thu, 24 May 2018 10:48:38 +0200 Subject: [PATCH] isinstance is used instead of __qualname__ --- src/apps/homescreen/__init__.py | 3 ++- src/apps/wallet/sign_tx/__init__.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/apps/homescreen/__init__.py b/src/apps/homescreen/__init__.py index 7b3265ea9..4c71eebf3 100644 --- a/src/apps/homescreen/__init__.py +++ b/src/apps/homescreen/__init__.py @@ -3,6 +3,7 @@ from trezor.utils import symbol, model from trezor.wire import register, protobuf_workflow from trezor.messages import wire_types from trezor.messages.Features import Features +from trezor.messages.Initialize import Initialize from trezor.messages.Success import Success from apps.common import storage, cache @@ -10,7 +11,7 @@ from apps.common import storage, cache async def respond_Features(ctx, msg): - if msg.__qualname__ == 'Initialize': + if isinstance(msg, Initialize): if msg.state is None or bytes(msg.state) != cache.get_state(state=bytes(msg.state)): cache.clear() diff --git a/src/apps/wallet/sign_tx/__init__.py b/src/apps/wallet/sign_tx/__init__.py index 14269b54a..a1cdace4c 100644 --- a/src/apps/wallet/sign_tx/__init__.py +++ b/src/apps/wallet/sign_tx/__init__.py @@ -1,7 +1,7 @@ from trezor import ui, wire -from trezor.messages.RequestType import TXFINISHED from trezor.messages.wire_types import TxAck from apps.common import seed +from apps.wallet.sign_tx.helpers import * @ui.layout @@ -26,17 +26,17 @@ async def sign_tx(ctx, msg): raise wire.Error(*e.args) except signing.Bip143Error as e: raise wire.Error(*e.args) - if req.__qualname__ == 'TxRequest': + if isinstance(req, TxRequest): if req.request_type == TXFINISHED: break res = await ctx.call(req, TxAck) - elif req.__qualname__ == 'UiConfirmOutput': + elif isinstance(req, UiConfirmOutput): res = await layout.confirm_output(ctx, req.output, req.coin) progress.report_init() - elif req.__qualname__ == 'UiConfirmTotal': + elif isinstance(req, UiConfirmTotal): res = await layout.confirm_total(ctx, req.spending, req.fee, req.coin) progress.report_init() - elif req.__qualname__ == 'UiConfirmFeeOverThreshold': + elif isinstance(req, UiConfirmFeeOverThreshold): res = await layout.confirm_feeoverthreshold(ctx, req.fee, req.coin) progress.report_init() else: