Refactored module structure

tests/common.py

@@ -1,26 +1,32 @@
 import unittest
 import config
 
-from bitkeylib.client import BitkeyClient
-from bitkeylib.debuglink import DebugLink
-from bitkeylib import proto
+from trezorlib.client import TrezorClient
+from trezorlib.debuglink import DebugLink
+from trezorlib import proto
 
-class BitkeyTest(unittest.TestCase):
+class TrezorTest(unittest.TestCase):
     def setUp(self):
         self.debug_transport = config.DEBUG_TRANSPORT(*config.DEBUG_TRANSPORT_ARGS)
         self.transport = config.TRANSPORT(*config.TRANSPORT_ARGS)
-        self.bitkey = BitkeyClient(self.transport, DebugLink(self.debug_transport), debug=True)
-        
-        self.bitkey.setup_debuglink(button=True, pin_correct=True)
-        
-        self.bitkey.load_device(
-            seed='soda country ghost glove unusual dose blouse cope bless medal block car',
-            pin='1234')
+        self.client = TrezorClient(self.transport, DebugLink(self.debug_transport), debug=True)
+
+        self.mnemonic1 = 'panda tree planet type cinnamon digital always essence grocery poor tree slot'
+        self.mnemonic2 = 'glory vanish past debate cricket extra receive spring scatter rebound bat expect'
+        self.pin1 = '1234'
+        self.pin2 = '43211'
+
+        self.client.setup_debuglink(button=True, pin_correct=True)
         
+        self.client.load_device(
+            seed=self.mnemonic1,
+            pin=self.pin1)
+
+        self.client.apply_settings(label='unit testing', coin_shortcut='BTC', language='english')
+
         print "Setup finished"
         print "--------------"
         
     def tearDown(self):
-        self.bitkey.init_device()
         self.debug_transport.close()
         self.transport.close()

tests/config.py

@@ -1,9 +1,9 @@
 import sys
 sys.path = ['../',] + sys.path
 
-from bitkeylib.transport_pipe import PipeTransport
-from bitkeylib.transport_hid import HidTransport
-from bitkeylib.transport_socket import SocketTransportClient
+from trezorlib.transport_pipe import PipeTransport
+from trezorlib.transport_hid import HidTransport
+from trezorlib.transport_socket import SocketTransportClient
 
 TRANSPORT = PipeTransport
 TRANSPORT_ARGS = ('../../trezor-emu/pipe.trezor', False)