Move device specific things to devices sub folder

achow101 · achow101 · commit 1c334c5cc9b1 · 2018-11-29T10:11:10.000-05:00
diff --git a/hwilib/commands.py b/hwilib/commands.py
@@ -40,22 +40,22 @@ def get_client(device_type, device_path, password=None):
 
     # Make a client
     if device_type == 'trezor':
-        from . import trezori
-        client = trezori.TrezorClient(device=device, path=device_path)
+        from .devices import trezor
+        client = trezor.TrezorClient(device=device, path=device_path)
     elif device_type == 'keepkey':
-        from . import keepkeyi
-        client = keepkeyi.KeepKeyClient(device=device, path=device_path)
+        from .devices import keepkey
+        client = keepkey.KeepKeyClient(device=device, path=device_path)
     elif device_type == 'ledger':
-        from . import ledgeri
-        client = ledgeri.LedgerClient(device=device)
+        from .devices import ledger
+        client = ledger.LedgerClient(device=device)
     elif device_type == 'digitalbitbox':
         if not password:
             raise NoPasswordError('Password must be supplied for digital BitBox')
-        from . import digitalbitboxi
-        client = digitalbitboxi.DigitalBitboxClient(device=device, password=password)
+        from .devices import digitalbitbox
+        client = digitalbitbox.DigitalBitboxClient(device=device, password=password)
     elif device_type == 'coldcard':
-        from . import coldcardi
-        client = coldcardi.ColdCardClient(device=device)
+        from .devices import coldcard
+        client = coldcard.ColdCardClient(device=device)
     else:
         raise UnknownDeviceError('Unknown device type specified')
     return client
diff --git a/hwilib/devices/__init__.py b/hwilib/devices/__init__.py
diff --git a/hwilib/devices/coldcard.py b/hwilib/devices/coldcard.py
@@ -1,10 +1,10 @@
 # Trezor interaction script
 
-from .hwwclient import HardwareWalletClient
+from ..hwwclient import HardwareWalletClient
 from ckcc.client import ColdcardDevice
 from ckcc.protocol import CCProtocolPacker
 from ckcc.constants import MAX_BLK_LEN
-from .base58 import xpub_main_2_test
+from ..base58 import xpub_main_2_test
 from hashlib import sha256
 
 import base64
diff --git a/hwilib/devices/digitalbitbox.py b/hwilib/devices/digitalbitbox.py
@@ -10,9 +10,9 @@
 import binascii
 import logging
 
-from .hwwclient import HardwareWalletClient
-from .serializations import CTransaction, PSBT, hash256, hash160, ser_sig_der, ser_sig_compact, ser_compact_size
-from .base58 import get_xpub_fingerprint, decode, to_address, xpub_main_2_test
+from ..hwwclient import HardwareWalletClient
+from ..serializations import CTransaction, PSBT, hash256, hash160, ser_sig_der, ser_sig_compact, ser_compact_size
+from ..base58 import get_xpub_fingerprint, decode, to_address, xpub_main_2_test
 
 applen = 225280 # flash size minus bootloader length
 chunksize = 8*512
diff --git a/hwilib/devices/keepkey.py b/hwilib/devices/keepkey.py
@@ -1,13 +1,13 @@
 # KeepKey interaction script
 
-from .hwwclient import HardwareWalletClient
+from ..hwwclient import HardwareWalletClient
 from keepkeylib.transport_hid import HidTransport
 from keepkeylib.client import KeepKeyClient as KeepKey
 from keepkeylib import tools
 from keepkeylib import messages_pb2, types_pb2 as proto
 from keepkeylib.tx_api import TxApi
-from .base58 import get_xpub_fingerprint, decode, to_address, xpub_main_2_test
-from .serializations import ser_uint256, uint256_from_str
+from ..base58 import get_xpub_fingerprint, decode, to_address, xpub_main_2_test
+from ..serializations import ser_uint256, uint256_from_str
 
 import binascii
 import json
@@ -175,7 +175,7 @@ def sign_tx(self, tx):
 
     # Must return a base64 encoded string with the signed message
     # The message can be any string
-    def sign_message(self, message):
+    def sign_message(self, message, keypath):
         raise NotImplementedError('The HardwareWalletClient base class does not '
             'implement this method')
 
diff --git a/hwilib/devices/ledger.py b/hwilib/devices/ledger.py
@@ -1,13 +1,13 @@
 # Ledger interaction script
 
-from .hwwclient import HardwareWalletClient
+from ..hwwclient import HardwareWalletClient
 from btchip.btchip import *
 from btchip.btchipUtils import *
 import base64
 import json
 import struct
-from . import base58
-from .serializations import hash256, hash160, ser_uint256, PSBT, CTransaction, HexToBase64
+from .. import base58
+from ..serializations import hash256, hash160, ser_uint256, PSBT, CTransaction, HexToBase64
 import binascii
 import logging
 
diff --git a/hwilib/devices/trezor.py b/hwilib/devices/trezor.py
@@ -1,14 +1,14 @@
 # Trezor interaction script
 
-from .hwwclient import HardwareWalletClient
+from ..hwwclient import HardwareWalletClient
 from trezorlib.client import TrezorClient as Trezor
 from trezorlib.transport import get_transport
 from trezorlib import protobuf, tools
 from trezorlib import messages as proto
 from trezorlib.tx_api import TxApi
-from .base58 import get_xpub_fingerprint, decode, to_address, xpub_main_2_test
-from .serializations import ser_uint256, uint256_from_str
-from . import bech32
+from ..base58 import get_xpub_fingerprint, decode, to_address, xpub_main_2_test
+from ..serializations import ser_uint256, uint256_from_str
+from .. import bech32
 
 import binascii
 import json
@@ -173,7 +173,7 @@ def sign_tx(self, tx):
 
     # Must return a base64 encoded string with the signed message
     # The message can be any string
-    def sign_message(self, message):
+    def sign_message(self, message, keypath):
         raise NotImplementedError('The HardwareWalletClient base class does not '
             'implement this method')
 
