tx.util -> autosign.util

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,

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)

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)

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()

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:

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
 

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

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()