From 98aef8418cf7fdc3e3333ce40d2303af0c1a97f4 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 16 Jan 2016 10:19:48 +0900 Subject: [PATCH] Construct base classes in right order Fixed #1632 --- plugins/keepkey/client.py | 2 +- plugins/trezor/client.py | 2 +- plugins/trezor/clientbase.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/keepkey/client.py b/plugins/keepkey/client.py index 5cdc4298..00de03be 100644 --- a/plugins/keepkey/client.py +++ b/plugins/keepkey/client.py @@ -3,9 +3,9 @@ from ..trezor.clientbase import TrezorClientBase class KeepKeyClient(TrezorClientBase, ProtocolMixin, BaseClient): def __init__(self, transport, handler, plugin, hid_id): - TrezorClientBase.__init__(self, handler, plugin, hid_id, proto) BaseClient.__init__(self, transport) ProtocolMixin.__init__(self, transport) + TrezorClientBase.__init__(self, handler, plugin, hid_id, proto) def recovery_device(self, *args): ProtocolMixin.recovery_device(self, True, *args) diff --git a/plugins/trezor/client.py b/plugins/trezor/client.py index 3ac41d31..3d1fe755 100644 --- a/plugins/trezor/client.py +++ b/plugins/trezor/client.py @@ -3,9 +3,9 @@ from clientbase import TrezorClientBase class TrezorClient(TrezorClientBase, ProtocolMixin, BaseClient): def __init__(self, transport, handler, plugin, hid_id): - TrezorClientBase.__init__(self, handler, plugin, hid_id, proto) BaseClient.__init__(self, transport) ProtocolMixin.__init__(self, transport) + TrezorClientBase.__init__(self, handler, plugin, hid_id, proto) TrezorClientBase.wrap_methods(TrezorClient) diff --git a/plugins/trezor/clientbase.py b/plugins/trezor/clientbase.py index cf221a97..ee370e99 100644 --- a/plugins/trezor/clientbase.py +++ b/plugins/trezor/clientbase.py @@ -65,6 +65,7 @@ class GuiMixin(object): class TrezorClientBase(GuiMixin, PrintError): def __init__(self, handler, plugin, hid_id, proto): + assert hasattr(self, 'tx_api') # ProtocolMixin already constructed? self.proto = proto self.device = plugin.device self.handler = handler