fixup! fix(python): use unified descriptor format <a;b>

trezor · Nov 4, 2021 · a86eb3a · a86eb3a
1 parent 5dc60b3
commit a86eb3a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/python/src/trezorlib/cli/btc.py b/python/src/trezorlib/cli/btc.py
@@ -248,8 +248,7 @@ def _get_descriptor(client, coin, account, script_type, show_display):
 def get_descriptor(client, coin, account, script_type, show_display):
     """Get descriptor of given account."""
     try:
-        d = _get_descriptor(client, coin, account, script_type, show_display)
-        click.echo(d)
+        return _get_descriptor(client, coin, account, script_type, show_display)
     except ValueError as e:
         raise click.ClickException(e.msg)
 

diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json
@@ -267,22 +267,22 @@
 "test_cancel.py::test_cancel_message_via_initialize[message1]": "b014449cbf1a45739d64a370b30af75df2228f48c090a02227bac8ed20c7b2dc",
 "test_cancel.py::test_cancel_on_paginated": "b014449cbf1a45739d64a370b30af75df2228f48c090a02227bac8ed20c7b2dc",
 "test_debuglink.py::test_softlock_instability": "9750df55cb4716f1d497d57de57257a0c5188fb652fcdb66a9d436d9c396c62b",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-descriptors0]": "24290396b20f26b49204a5551676d6f3c831009e30582d92d5b44fcc3c12fdb7",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-descriptors4]": "8977c539f5680a5196ad0a4c6e16c44ca1bbdb79235dbf97e33aad8d47fe5d0c",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-descriptors12]": "3c31e8f9e396a1313c22480aac32f901086df23d8edf3f808d2f46a0d063034b",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-descriptors8]": "964aad153606c8eadd80732d62daa0ce55c2da63696cc64ef6c9a9a284e172f5",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-descriptors1]": "7fe56ce17bad4616d1a77700d4e402a74891fa5091e3ebdb977858db72f7d816",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-descriptors5]": "d63a52ed4963bbbe3b8f8e9f069d2832a5f3c97fdd57f8f3a6b718afed971a5b",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-descriptors13]": "8485b5ab782053c8053f6a48aca9b835697429684b2d7e83adaafc152df6eb15",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-descriptors9]": "7b396acae859fd05e6f0b905436db80274ebba3714f0a8d5d3a155e2e0209e7b",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-descriptors2]": "b8e302f8711b50cc18783c9afa63f4f0969babe658b8317a427f6686d53729df",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-descriptors6]": "33f8039f1015c24651484374fee2e3f5ae33b1561abe70dd73ab8aeda3c25f86",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-descriptors14]": "a5c25c73db53b01894851bcbf54fdf72a6cf9f8e0cb56f05ba42f6ab909bb970",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-descriptors10]": "054b75cb4b2310eefdeb7cc48a146ff872bf93c37afd633ea0ac95287b2dfd23",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-descriptors3]": "76e5bcf27e8d233f25b04c2dda11c6f3067433597bb799013f867982f535ba71",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-descriptors7]": "6261537d1445ce1fb637760f8ec77aae8650ee4f0f5ab919ba1a41f039a02b1f",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-descriptors15]": "fe4691af27c7221ac650927a4ee64aeb17ba323f746a03763d053a8311f6633b",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-descriptors11]": "3181b25e844eb1047d2904abb1099029c5f5ae4ba4d333be21336d1a745aafe0",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-pkh([5c9e228d--320142b4": "24290396b20f26b49204a5551676d6f3c831009e30582d92d5b44fcc3c12fdb7",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-b24e2107": "8977c539f5680a5196ad0a4c6e16c44ca1bbdb79235dbf97e33aad8d47fe5d0c",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-9054cc56": "3c31e8f9e396a1313c22480aac32f901086df23d8edf3f808d2f46a0d063034b",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-03bfb318": "964aad153606c8eadd80732d62daa0ce55c2da63696cc64ef6c9a9a284e172f5",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-pkh([5c9e228d--85b37387": "7fe56ce17bad4616d1a77700d4e402a74891fa5091e3ebdb977858db72f7d816",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-2b60fb42": "d63a52ed4963bbbe3b8f8e9f069d2832a5f3c97fdd57f8f3a6b718afed971a5b",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-db6f570e": "8485b5ab782053c8053f6a48aca9b835697429684b2d7e83adaafc152df6eb15",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-d13891a1": "7b396acae859fd05e6f0b905436db80274ebba3714f0a8d5d3a155e2e0209e7b",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-pkh([5c9e228d--b10eca4b": "b8e302f8711b50cc18783c9afa63f4f0969babe658b8317a427f6686d53729df",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-c4852b21": "33f8039f1015c24651484374fee2e3f5ae33b1561abe70dd73ab8aeda3c25f86",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-cfc84a2d": "a5c25c73db53b01894851bcbf54fdf72a6cf9f8e0cb56f05ba42f6ab909bb970",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-e2ffb41b": "054b75cb4b2310eefdeb7cc48a146ff872bf93c37afd633ea0ac95287b2dfd23",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-pkh([5c9e228d--7325a10a": "76e5bcf27e8d233f25b04c2dda11c6f3067433597bb799013f867982f535ba71",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-8ebbf5d1": "6261537d1445ce1fb637760f8ec77aae8650ee4f0f5ab919ba1a41f039a02b1f",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-cf46cbc2": "fe4691af27c7221ac650927a4ee64aeb17ba323f746a03763d053a8311f6633b",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-e36bb63b": "3181b25e844eb1047d2904abb1099029c5f5ae4ba4d333be21336d1a745aafe0",
 "test_msg_applysettings.py-test_apply_homescreen_toif": "7e7fb6223f2113a592c848cd8e57aa22eb002e6472abb5045814f7fe958b2818",
 "test_msg_applysettings.py-test_apply_homescreen_toif_fail[TOIf\\x80\\x00\\x80\\x00~\\x00\\x00\\x00-fefdb3aa": "d81ff1a197803cfda9180cad05dad5c1912a064da957d036c1311fa3eeef4b70",
 "test_msg_applysettings.py-test_apply_homescreen_toif_fail[TOIf\\x90\\x00\\x90\\x00~XXXf\\x90\\x00-4f4d817c": "d81ff1a197803cfda9180cad05dad5c1912a064da957d036c1311fa3eeef4b70",