From 41bc51e3564c347aeb40b8231ffe4358f87518bb Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 9 Sep 2026 18:33:59 +0000 Subject: [PATCH] `tx.util` -> `autosign.util` --- mmgen/{tx => autosign}/util.py | 4 ++-- mmgen/main_addrimport.py | 2 +- mmgen/main_txbump.py | 2 +- mmgen/main_txcreate.py | 2 +- mmgen/main_txsend.py | 4 ++-- mmgen/xmrwallet/file/outputs.py | 2 +- mmgen/xmrwallet/file/tx.py | 2 +- mmgen/xmrwallet/ops/__init__.py | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) rename mmgen/{tx => autosign}/util.py (94%) diff --git a/mmgen/tx/util.py b/mmgen/autosign/util.py similarity index 94% rename from mmgen/tx/util.py rename to mmgen/autosign/util.py index 12af84e6..cfff5bec 100755 --- a/mmgen/tx/util.py +++ b/mmgen/autosign/util.py @@ -9,12 +9,12 @@ # https://gitlab.com/mmgen/mmgen-wallet """ -tx.util: transaction utilities +autosign.util: autosign utilities """ def get_autosign_obj(cfg, add_cfg={}): from ..cfg import Config - from ..autosign import Autosign + from . import Autosign return Autosign( Config({ '_clone': cfg, diff --git a/mmgen/main_addrimport.py b/mmgen/main_addrimport.py index 3b4ddd51..d3747e9b 100755 --- a/mmgen/main_addrimport.py +++ b/mmgen/main_addrimport.py @@ -133,7 +133,7 @@ def check_xmr_args(): async def main(): if cfg._proto.base_coin == 'XMR': - from .tx.util import mount_removable_device + from .autosign.util import mount_removable_device from .xmrwallet import op as xmrwallet_op check_xmr_args() mount_removable_device(cfg) diff --git a/mmgen/main_txbump.py b/mmgen/main_txbump.py index 3bdaced9..37a4890f 100755 --- a/mmgen/main_txbump.py +++ b/mmgen/main_txbump.py @@ -167,7 +167,7 @@ silent = cfg.yes and cfg.fee is not None and cfg.output_to_reduce is not None async def main(): if cfg.autosign: - from .tx.util import mount_removable_device + from .autosign.util import mount_removable_device from .autosign.signable import Signable asi = mount_removable_device(cfg) si = Signable.automount_transaction(asi) diff --git a/mmgen/main_txcreate.py b/mmgen/main_txcreate.py index 09d6eb73..561f1bb2 100755 --- a/mmgen/main_txcreate.py +++ b/mmgen/main_txcreate.py @@ -138,7 +138,7 @@ if not (cfg.info or cfg.contract_data or cfg.coin == 'XMR'): async def main(): if cfg.autosign: - from .tx.util import mount_removable_device + from .autosign.util import mount_removable_device from .autosign.signable import Signable asi = mount_removable_device(cfg, add_cfg={'xmrwallet_compat': True}) Signable.automount_transaction(asi).check_create_ok() diff --git a/mmgen/main_txsend.py b/mmgen/main_txsend.py index c53ca46d..4e954e7c 100755 --- a/mmgen/main_txsend.py +++ b/mmgen/main_txsend.py @@ -107,9 +107,9 @@ asi, tx_range = (None, None) def init_autosign(arg): global asi, si, infile, tx_range - from .tx.util import mount_removable_device - from .tx.online import SentTXRange + from .autosign.util import mount_removable_device from .autosign.signable import Signable + from .tx.online import SentTXRange asi = mount_removable_device(cfg) si = Signable.automount_transaction(asi) if cfg.abort: diff --git a/mmgen/xmrwallet/file/outputs.py b/mmgen/xmrwallet/file/outputs.py index eeb2a15d..7fd86579 100755 --- a/mmgen/xmrwallet/file/outputs.py +++ b/mmgen/xmrwallet/file/outputs.py @@ -17,7 +17,7 @@ from collections import namedtuple from pathlib import Path from ...util import die, suf -from ...tx.util import get_autosign_obj +from ...autosign.util import get_autosign_obj from . import MoneroMMGenFile diff --git a/mmgen/xmrwallet/file/tx.py b/mmgen/xmrwallet/file/tx.py index df292968..c7416fa9 100755 --- a/mmgen/xmrwallet/file/tx.py +++ b/mmgen/xmrwallet/file/tx.py @@ -22,7 +22,7 @@ from ...util import die, fmt, make_timestr, list_gen from ...seed import SeedID from ...protocol import init_proto from ...addr import CoinAddr -from ...tx.util import get_autosign_obj +from ...autosign.util import get_autosign_obj from ..include import XMRWalletAddrSpec from . import MoneroMMGenFile diff --git a/mmgen/xmrwallet/ops/__init__.py b/mmgen/xmrwallet/ops/__init__.py index e6e83a79..c8a9e879 100755 --- a/mmgen/xmrwallet/ops/__init__.py +++ b/mmgen/xmrwallet/ops/__init__.py @@ -17,7 +17,7 @@ import re from ...color import blue from ...util import msg, die, fmt from ...protocol import init_proto -from ...tx.util import get_autosign_obj +from ...autosign.util import get_autosign_obj from ... import xmrwallet @@ -119,7 +119,7 @@ class OpBase: def mount_removable_device(self): if self.cfg.autosign: - from ...tx.util import mount_removable_device + from ...autosign.util import mount_removable_device mount_removable_device(self.cfg, do_umount=self.do_umount, asi=self.asi) self.post_mount_action()