diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py index 74a52a6e2..3485bd481 100644 --- a/plugins/trezor/plugin.py +++ b/plugins/trezor/plugin.py @@ -97,8 +97,7 @@ class TrezorCompatiblePlugin(HW_PluginBase): pair = [device.path, None] try: - from trezorlib.transport_hid import HidTransport - return HidTransport(pair) + return self.HidTransport(pair) except BaseException as e: raise self.print_error("cannot connect at", device.path, str(e)) @@ -108,8 +107,7 @@ class TrezorCompatiblePlugin(HW_PluginBase): self.print_error("Trying to connect over Trezor Bridge...") try: - from trezorlib.transport_bridge import BridgeTransport - return BridgeTransport({'path': hexlify(device.path)}) + return self.BridgeTransport({'path': hexlify(device.path)}) except BaseException as e: self.print_error("cannot connect to bridge", str(e)) return None diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py index e72be787d..683b9e05c 100644 --- a/plugins/trezor/trezor.py +++ b/plugins/trezor/trezor.py @@ -14,7 +14,8 @@ class TrezorPlugin(TrezorCompatiblePlugin): from .client import TrezorClient as client_class import trezorlib.ckd_public as ckd_public from trezorlib.client import types - from trezorlib.transport_hid import DEVICE_IDS + from trezorlib.transport_hid import HidTransport, DEVICE_IDS + from trezorlib.transport_bridge import BridgeTransport libraries_available = True except ImportError: libraries_available = False