chore: fix emulator build error and track the new code base

bitcoin-core · Jun 26, 2024 · 9fa1996 · 9fa1996
1 parent 67258c3
commit 9fa1996
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/hwilib/devices/onekey.py b/hwilib/devices/onekey.py
@@ -283,11 +283,12 @@ def __init__(
         self.client.ensure_model = MethodType(ensure_model, self.client)
 
 def enumerate(
-    password: Optional[str] = None, expert: bool = False, chain: Chain = Chain.MAIN
+    password: Optional[str] = None, expert: bool = False, chain: Chain = Chain.MAIN, allow_emulators: bool = False
 ) -> List[Dict[str, Any]]:
     results = []
     devs = webusb.WebUsbTransport.enumerate(usb_ids=USB_IDS)
-    devs.extend(udp.UdpTransport.enumerate(path=ONEKEY_EMULATOR_PATH))
+    if allow_emulators:
+        devs.extend(udp.UdpTransport.enumerate(path=ONEKEY_EMULATOR_PATH))
     for dev in devs:
         d_data: Dict[str, Any] = {}
 

diff --git a/test/setup_environment.sh b/test/setup_environment.sh
@@ -145,6 +145,7 @@ if [[ -n ${build_onekey_1} || -n ${build_onekey_t} ]]; then
         git checkout bixin_dev
         git checkout .
         git pull origin bixin_dev
+        poetry lock --no-update
         poetry install
         poetry run pip install protobuf==3.20.0
         export EMULATOR=1 DEBUG_LINK=1 TREZOR_TRANSPORT_V1=1 
@@ -165,6 +166,7 @@ if [[ -n ${build_onekey_1} || -n ${build_onekey_t} ]]; then
         git checkout .
         git pull origin touch
         git submodule update --init --recursive vendor/lvgl_mp
+        poetry lock --no-update
         poetry install
         cd core
         poetry run make build_unix

diff --git a/test/test_onekey.py b/test/test_onekey.py
@@ -203,7 +203,7 @@ def setUp(self):
         self.dev_args = ['-t', 'onekey', '-d', "udp:127.0.0.1:54935"]
 
     def test_label(self):
-        result = self.do_command(self.dev_args + ['enumerate'])
+        result = self.do_command(self.dev_args + ["--emulators", "enumerate"])
         for dev in result:
             if dev['type'] == 'onekey' and dev['path'] == "udp:127.0.0.1:54935":
                 self.assertEqual(dev['label'], 'test')