AaronFiore/electrum
1
0
Fork 0
Code Activity

Clean up client caching and handling

Browse Source
This commit is contained in:
Neil Booth
2016-01-20 00:28:54 +09:00
parent a1d55fac4e
commit 24037be99c
6 changed files with 197 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/trezor/clientbase.py
View File

@@ -68,27 +68,22 @@ class GuiMixin(object):
class TrezorClientBase(GuiMixin, PrintError):
def __init__(self, handler, plugin, hid_id, proto):
def __init__(self, handler, plugin, proto):
assert hasattr(self, 'tx_api') # ProtocolMixin already constructed?
self.proto = proto
self.device = plugin.device
self.handler = handler
self.hid_id_ = hid_id
self.tx_api = plugin
self.types = plugin.types
self.msg_code_override = None
def __str__(self):
return "%s/%s" % (self.label(), self.hid_id())
return "%s/%s" % (self.label(), self.features.device_id)
def label(self):
'''The name given by the user to the device.'''
return self.features.label
def hid_id(self):
'''The HID ID of the device.'''
return self.hid_id_
def is_initialized(self):
'''True if initialized, False if wiped.'''
return self.features.initialized
@@ -163,7 +158,7 @@ class TrezorClientBase(GuiMixin, PrintError):
def close(self):
'''Called when Our wallet was closed or the device removed.'''
self.print_error("disconnected")
self.print_error("closing client")
self.clear_session()
# Release the device
self.transport.close()