From 2e8e22fcde4838494a5af2a8aedf25cf8c90b9a9 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Sat, 17 Feb 2024 09:45:09 +0000
Subject: [PATCH] cmdtest autosign,xmr_autosign: minor cleanups

---
 test/cmdtest_py_d/ct_autosign.py     |  8 +++---
 test/cmdtest_py_d/ct_xmr_autosign.py | 43 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/test/cmdtest_py_d/ct_autosign.py b/test/cmdtest_py_d/ct_autosign.py
index 864c9130..7bd6ff8b 100755
--- a/test/cmdtest_py_d/ct_autosign.py
+++ b/test/cmdtest_py_d/ct_autosign.py
@@ -68,8 +68,8 @@ class CmdTestAutosignBase(CmdTestBase):
 	networks     = ('btc',)
 	tmpdir_nums  = [18]
 	color        = True
+	win_skip     = True
 	no_insert_check = True
-	win_skip = True
 	have_online = False
 
 	def __init__(self,trunner,cfgs,spawn):
@@ -531,7 +531,7 @@ class CmdTestAutosignLive(CmdTestAutosignBTC):
 
 		omsg(purple(f'Running autosign test with {opts_msg}'))
 
-		self.do_umount_online()
+		self.do_umount()
 		prompt_remove()
 		omsg(green(info_msg))
 		t = self.spawn(
@@ -541,9 +541,9 @@ class CmdTestAutosignLive(CmdTestAutosignBTC):
 			omsg('')
 		prompt_insert_sign(t)
 
-		self.do_mount_online() # race condition due to device insertion detection
+		self.do_mount() # race condition due to device insertion detection
 		self.remove_signed_txfiles()
-		self.do_umount_online()
+		self.do_umount()
 
 		imsg(purple('\nKilling wait loop!'))
 		t.kill(2) # 2 = SIGINT
diff --git a/test/cmdtest_py_d/ct_xmr_autosign.py b/test/cmdtest_py_d/ct_xmr_autosign.py
index e3ba9319..07b2e07b 100755
--- a/test/cmdtest_py_d/ct_xmr_autosign.py
+++ b/test/cmdtest_py_d/ct_xmr_autosign.py
@@ -44,10 +44,10 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
 	"""
 	Monero autosigning operations
 	"""
-
 	tmpdir_nums = [39]
 
 	# ct_xmrwallet attrs:
+	tx_relay_user = 'miner'
 	user_data = (
 		('miner', '98831F3A', False, 130, '1', []),
 		('alice', 'FE3C6545', True,  150, '1-2', []),
@@ -60,7 +60,6 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
 	live         = False
 	simulate_led = False
 	bad_tx_count = 0
-	tx_relay_user = 'miner'
 	no_insert_check = False
 	win_skip = True
 	have_online = True
@@ -126,8 +125,8 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
 
 		self.burn_addr = make_burn_addr()
 
-		self.opts.append('--xmrwallets={}'.format(self.users['alice'].kal_range))     # mmgen-autosign opts
-		self.autosign_opts = ['--autosign']                                           # mmgen-xmrwallet opts
+		self.opts.append('--xmrwallets={}'.format(self.users['alice'].kal_range)) # mmgen-autosign opts
+		self.autosign_opts = ['--autosign']                                       # mmgen-xmrwallet opts
 		self.tx_count = 1
 		self.spawn_env['MMGEN_TEST_SUITE_XMR_AUTOSIGN'] = '1'
 
@@ -294,8 +293,8 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
 		self.do_umount_online()
 		return self._create_transfer_tx('0.257')
 
-	def _wait_signed(self,dtype):
-		oqmsg_r(gray(f'→ offline wallet{"s" if dtype.endswith("s") else ""} signing {dtype}'))
+	def _wait_signed(self,desc):
+		oqmsg_r(gray(f'→ offline wallet{"s" if desc.endswith("s") else ""} signing {desc}'))
 		assert not self.device_inserted, f'‘{self.asi.dev_label_path}’ is inserted!'
 		assert not self.asi.mountpoint.is_mount(), f'‘{self.asi.mountpoint}’ is mounted!'
 		self.insert_device()
@@ -316,14 +315,14 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
 	def _xmr_autosign_op(
 			self,
 			op,
-			desc        = None,
-			dtype       = None,
-			ext         = None,
-			wallet_arg  = None,
-			add_opts    = [],
-			wait_signed = False):
+			desc          = None,
+			signable_desc = None,
+			ext           = None,
+			wallet_arg    = None,
+			add_opts      = [],
+			wait_signed   = False):
 		if wait_signed:
-			self._wait_signed(dtype)
+			self._wait_signed(signable_desc)
 		data = self.users['alice']
 		args = (
 			self.extra_opts
@@ -379,11 +378,11 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
 	def _submit_transfer_tx(self,relay_parm=None,ext=None,op='submit',check_bal=True):
 		self.insert_device_online()
 		t = self._xmr_autosign_op(
-			op       = op,
-			add_opts = [f'--tx-relay-daemon={relay_parm}'] if relay_parm else [],
-			ext      = ext,
-			dtype    = 'transaction',
-			wait_signed = op == 'submit' )
+			op            = op,
+			add_opts      = [f'--tx-relay-daemon={relay_parm}'] if relay_parm else [],
+			ext           = ext,
+			signable_desc = 'transaction',
+			wait_signed   = op == 'submit')
 		t.expect( f'{op.capitalize()} transaction? (y/N): ', 'y' )
 		t.written_to_file('Submitted transaction')
 		self.remove_device_online()
@@ -412,10 +411,10 @@ class CmdTestXMRAutosign(CmdTestXMRWallet,CmdTestAutosignBase):
 	def _import_key_images(self,wallet_arg):
 		self.insert_device_online()
 		t = self._xmr_autosign_op(
-			op    = 'import-key-images',
-			wallet_arg = wallet_arg,
-			dtype = 'wallet outputs',
-			wait_signed = True )
+			op            = 'import-key-images',
+			wallet_arg    = wallet_arg,
+			signable_desc = 'wallet outputs',
+			wait_signed   = True)
 		t.read()
 		self.remove_device_online()
 		return t