From b47412bbc1afa4af8348ad1b7f3a44667e6a7dc5 Mon Sep 17 00:00:00 2001 From: scgbckbone Date: Thu, 3 Apr 2025 16:00:47 +0200 Subject: [PATCH] fixes --- shared/address_explorer.py | 2 +- testing/test_ccc.py | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/shared/address_explorer.py b/shared/address_explorer.py index 17bc52ae..dfa669a7 100644 --- a/shared/address_explorer.py +++ b/shared/address_explorer.py @@ -503,7 +503,7 @@ async def make_address_summary_file(path, addr_fmt, ms_wallet, account_num, if ms_wallet: # sign with my key at the same path as first address of export addr_fmt = AF_CLASSIC - derive = ms_wallet.get_my_key(settings.get('xfp'))[1] + derive = ms_wallet.get_my_deriv(settings.get('xfp')) derive += "/%d/%d" % (change, start) else: derive = path.format(account=account_num, change=change, idx=start) # first addr diff --git a/testing/test_ccc.py b/testing/test_ccc.py index c9bfa61b..deeb4402 100644 --- a/testing/test_ccc.py +++ b/testing/test_ccc.py @@ -516,19 +516,13 @@ def ccc_ms_setup(microsd_path, virtdisk_path, scan_a_qr, is_q1, cap_menu, pick_m @pytest.fixture def bitcoind_create_watch_only_wallet(pick_menu_item, need_keypress, microsd_path, - cap_story, bitcoind, press_cancel): + cap_story, bitcoind, press_cancel, load_export): def doit(ms_menu_item): pick_menu_item(ms_menu_item) pick_menu_item("Descriptors") pick_menu_item("Bitcoin Core") - time.sleep(.1) - need_keypress("1") - time.sleep(.1) - title, story = cap_story() - assert "Bitcoin Core multisig setup file written" in story - fname = story.split("\n\n")[-1] - with open(microsd_path(fname), "r") as f: - res = f.read() + + res = load_export("sd", label="Bitcoin Core multisig setup", is_json=False) res = res.replace("importdescriptors ", "").strip() r1 = res.find("[")