trezorctl: cleanup

tests/device_tests/common.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 import unittest
 import hashlib
 
-from trezorlib.client import TrezorClient, TrezorDebugClient
+from trezorlib.client import TrezorClient, TrezorClientDebugLink
 from trezorlib import tx_api
 import config
 
@@ -35,7 +35,7 @@ class TrezorTest(unittest.TestCase):
         transport = config.TRANSPORT(*config.TRANSPORT_ARGS, **config.TRANSPORT_KWARGS)
         if hasattr(config, 'DEBUG_TRANSPORT'):
             debug_transport = config.DEBUG_TRANSPORT(*config.DEBUG_TRANSPORT_ARGS, **config.DEBUG_TRANSPORT_KWARGS)
-            self.client = TrezorDebugClient(transport)
+            self.client = TrezorClientDebugLink(transport)
             self.client.set_debuglink(debug_transport)
         else:
             self.client = TrezorClient(transport)

tools/signtest.py

@@ -10,7 +10,6 @@ import trezorlib.ckd_public as bip32
 
 import hashlib
 from trezorlib.client import TrezorClient
-from trezorlib.client import TrezorClientDebug
 from trezorlib.tx_api import TxApiTestnet
 from trezorlib.tx_api import TxApiBitcoin
 from trezorlib.transport_hid import HidTransport

trezorctl

@@ -21,17 +21,16 @@
 
 from __future__ import print_function
 import sys
-import os
 import binascii
 import argparse
 import json
 import base64
-import tempfile
 from io import BytesIO
 
-from trezorlib.client import TrezorClient, TrezorClientDebug, CallException
+from trezorlib.client import TrezorClient, TrezorClientVerbose, CallException
 import trezorlib.types_pb2 as types
 
+
 ether_units = {
     "wei":          1,
     "kwei":         1000,
@@ -54,6 +53,7 @@ ether_units = {
     "eth":          1000000000000000000,
 }
 
+
 def init_parser(commands):
     parser = argparse.ArgumentParser(description='Commandline tool for TREZOR devices.')
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', help='Prints communication to device')
@@ -80,38 +80,33 @@ def init_parser(commands):
 
     return parser
 
-def get_transport(transport_string, path, **kwargs):
+
-    if transport_string == 'usb':
+def get_transport_class_by_name(name):
+
+    if name == 'usb':
         from trezorlib.transport_hid import HidTransport
+        return HidTransport
 
-        for d in HidTransport.enumerate():
+    if name == 'udp':
-            # Two-tuple of (normal_interface, debug_interface)
-            if path == '' or path in d:
-                return HidTransport(d, **kwargs)
-
-        raise CallException(types.Failure_NotInitialized, "Device not found")
-
-    if transport_string == 'udp':
         from trezorlib.transport_udp import UdpTransport
-        return UdpTransport(path, **kwargs)
+        return UdpTransport
 
-    if transport_string == 'pipe':
+    if name == 'pipe':
         from trezorlib.transport_pipe import PipeTransport
-        if path == '':
+        return PipeTransport
-            path = '/tmp/pipe.trezor'
-        return PipeTransport(path, is_device=False, **kwargs)
 
-    if transport_string == 'bridge':
+    if name == 'bridge':
         from trezorlib.transport_bridge import BridgeTransport
+        return BridgeTransport
 
-        devices = BridgeTransport.enumerate()
+    raise NotImplementedError('Unknown transport: "%s"' % name)
-        for d in devices:
-            if path == '' or d['path'] == binascii.hexlify(path):
-                return BridgeTransport(d, **kwargs)
 
-        raise CallException(types.Failure_NotInitialized, "Device not found")
 
-    raise NotImplementedError("Unknown transport")
+def get_transport(transport_name, path):
+    transport = get_transport_class_by_name(transport_name)
+    dev = transport.find_by_path(path)
+    return dev
+
 
 class Commands(object):
     def __init__(self, client):
@@ -594,7 +589,7 @@ def main():
 
         transport = get_transport(args.transport, args.path)
         if args.verbose:
-            client = TrezorClientDebug(transport)
+            client = TrezorClientVerbose(transport)
         else:
             client = TrezorClient(transport)
 
@@ -616,3 +611,4 @@ def main():
 
 if __name__ == '__main__':
     main()
+    

trezorlib/client.py

@@ -216,10 +216,10 @@ class BaseClient(object):
         self.transport.close()
 
 
-class DebugWireMixin(object):
+class VerboseWireMixin(object):
     def call_raw(self, msg):
         log("SENDING " + pprint(msg))
-        resp = super(DebugWireMixin, self).call_raw(msg)
+        resp = super(VerboseWireMixin, self).call_raw(msg)
         log("RECEIVED " + pprint(resp))
         return resp
 
@@ -1032,9 +1032,9 @@ class TrezorClient(ProtocolMixin, TextUIMixin, BaseClient):
     pass
 
 
-class TrezorClientDebug(ProtocolMixin, TextUIMixin, DebugWireMixin, BaseClient):
+class TrezorClientVerbose(ProtocolMixin, TextUIMixin, VerboseWireMixin, BaseClient):
     pass
 
 
-class TrezorDebugClient(ProtocolMixin, DebugLinkMixin, DebugWireMixin, BaseClient):
+class TrezorClientDebugLink(ProtocolMixin, DebugLinkMixin, VerboseWireMixin, BaseClient):
     pass

trezorlib/transport_bridge.py

@@ -19,6 +19,7 @@
 
 '''BridgeTransport implements transport TREZOR Bridge (aka trezord).'''
 
+import binascii
 import json
 import requests
 from . import protobuf_json
@@ -34,6 +35,7 @@ def get_error(resp):
 
 
 class BridgeTransport(TransportV1):
+
     CONFIGURED = False
 
     def __init__(self, device, *args, **kwargs):
@@ -71,11 +73,21 @@ class BridgeTransport(TransportV1):
         r = requests.get(TREZORD_HOST + '/enumerate')
         if r.status_code != 200:
             raise Exception('trezord: Could not enumerate devices' + get_error(r))
-
         enum = r.json()
-
         return enum
 
+    @classmethod
+    def find_by_path(cls, path=None):
+        """
+        Finds a device by transport-specific path.
+        If path is not set, return first device.
+        """
+        devices = cls.enumerate()
+        for dev in devices:
+            if not path or dev['path'] == binascii.hexlify(path):
+                return cls(dev)
+        raise Exception('Device not found')
+
     def _open(self):
         r = self.conn.post(TREZORD_HOST + '/acquire/%s' % self.path)
         if r.status_code != 200:

trezorlib/transport_hid.py

@@ -48,6 +48,18 @@ def enumerate():
     return sorted(devices.values())
 
 
+def find_by_path(path=None):
+    """
+    Finds a device by transport-specific path.
+    If path is not set, return first device.
+    """
+    devices = enumerate()
+    for dev in devices:
+        if not path or path in dev:
+            return HidTransport(dev)
+    raise Exception('Device not found')
+
+
 def path_to_transport(path):
     try:
         device = [d for d in hid.enumerate(0, 0) if d['path'] == path][0]
@@ -168,3 +180,4 @@ def HidTransport(device, *args, **kwargs):
 
 # Backward compatibility hack; HidTransport is a function, not a class like before
 HidTransport.enumerate = enumerate
+HidTransport.find_by_path = find_by_path

trezorlib/transport_pipe.py

@@ -28,11 +28,22 @@ Use this transport for talking with trezor simulator."""
 
 
 class PipeTransport(TransportV1):
-    def __init__(self, device, is_device, *args, **kwargs):
+
+    def __init__(self, device='/tmp/pipe.trezor', is_device=False, *args, **kwargs):
+        if not device:
+            device = '/tmp/pipe.trezor'
         self.is_device = is_device  # set True if act as device
 
         super(PipeTransport, self).__init__(device, *args, **kwargs)
 
+    @classmethod
+    def enumerate(cls):
+        raise Exception('This transport cannot enumerate devices')
+
+    @classmethod
+    def find_by_path(cls, path=None):
+        return cls(path)
+
     def _open(self):
         if self.is_device:
             self.filename_read = self.device + '.to'

trezorlib/transport_udp.py

@@ -24,6 +24,7 @@ from .transport import TransportV2
 
 
 class UdpTransport(TransportV2):
+
     def __init__(self, device, *args, **kwargs):
         device = device.split(':')
         if len(device) < 2:
@@ -38,6 +39,14 @@ class UdpTransport(TransportV2):
         self.socket = None
         super(UdpTransport, self).__init__(device, *args, **kwargs)
 
+    @classmethod
+    def enumerate(cls):
+        raise Exception('This transport cannot enumerate devices')
+
+    @classmethod
+    def find_by_path(cls, path=None):
+        return cls(path)
+
     def _open(self):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.socket.connect(self.device)