From 77f0194a37075fd747fbdfad68fd3381d1494f49 Mon Sep 17 00:00:00 2001 From: Matt Whitlock Date: Sat, 4 Nov 2023 16:37:51 -0400 Subject: [PATCH] wallet_utils: use new get_utxos_at_mixdepth method Rather than evaluating wallet_service.get_utxos_by_mixdepth()[md], instead evaluate wallet_service.get_utxos_at_mixdepth(md). This way we're not computing a bunch of data that we'll immediately discard. --- src/jmclient/wallet_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jmclient/wallet_utils.py b/src/jmclient/wallet_utils.py index d59096b..c1165ff 100644 --- a/src/jmclient/wallet_utils.py +++ b/src/jmclient/wallet_utils.py @@ -407,8 +407,8 @@ def get_imported_privkey_branch(wallet_service, m, showprivkey): addr = wallet_service.get_address_from_path(path) script = wallet_service.get_script_from_path(path) balance = 0.0 - for data in wallet_service.get_utxos_by_mixdepth( - include_disabled=True)[m].values(): + for data in wallet_service.get_utxos_at_mixdepth(m, + include_disabled=True).values(): if script == data['script']: balance += data['value'] status = ('used' if balance > 0.0 else 'empty') @@ -1276,8 +1276,8 @@ def display_utxos_for_disable_choice_default(wallet_service, utxos_enabled, def get_utxos_enabled_disabled(wallet_service, md): """ Returns dicts for enabled and disabled separately """ - utxos_enabled = wallet_service.get_utxos_by_mixdepth()[md] - utxos_all = wallet_service.get_utxos_by_mixdepth(include_disabled=True)[md] + utxos_enabled = wallet_service.get_utxos_at_mixdepth(md) + utxos_all = wallet_service.get_utxos_at_mixdepth(md, include_disabled=True) utxos_disabled_keyset = set(utxos_all).difference(set(utxos_enabled)) utxos_disabled = {} for u in utxos_disabled_keyset: