From 026f4a4c1d3aaad97f596604b46ee7583fba296f Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Mon, 21 Apr 2025 14:01:16 +0000
Subject: [PATCH] cmdtest.py: minor fixes and cleanups

---
 test/cmdtest_d/autosign.py          |  2 +-
 test/cmdtest_d/ethbump.py           |  3 ++-
 test/cmdtest_d/ethdev.py            | 10 +++++++++-
 test/cmdtest_d/ethswap.py           |  3 ++-
 test/cmdtest_d/include/group_mgr.py |  2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/test/cmdtest_d/autosign.py b/test/cmdtest_d/autosign.py
index 3988954d..66f8385b 100755
--- a/test/cmdtest_d/autosign.py
+++ b/test/cmdtest_d/autosign.py
@@ -656,9 +656,9 @@ class CmdTestAutosign(CmdTestAutosignBase):
 		('sign_no_unsigned',          'signing transactions and messages (nothing to sign)'),
 		('sign_no_unsigned_xmr',      'signing transactions and messages (nothing to sign, with XMR)'),
 		('sign_no_unsigned_xmronly',  'signing transactions and messages (nothing to sign, XMR-only)'),
-		('wipe_key',                  'wiping the wallet encryption key'),
 		('stop_daemons',              'stopping daemons'),
 		('sign_bad_no_daemon',        'signing transactions (error, no daemons running)'),
+		('wipe_key',                  'wiping the wallet encryption key'),
 	)
 
 	def __init__(self, cfg, trunner, cfgs, spawn):
diff --git a/test/cmdtest_d/ethbump.py b/test/cmdtest_d/ethbump.py
index e733e48f..bd27bb4a 100755
--- a/test/cmdtest_d/ethbump.py
+++ b/test/cmdtest_d/ethbump.py
@@ -247,6 +247,7 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthSwapMethods, CmdTestSwapMe
 			'_clone': trunner.cfg,
 			'coin': 'ltc',
 			'resume': None,
+			'resuming': None,
 			'resume_after': None,
 			'exit_after': None,
 			'log': None})
@@ -292,7 +293,7 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthSwapMethods, CmdTestSwapMe
 		return self._bal_check(pat=rf'{dfl_sid}:E:2\s+777\s')
 
 	def bal3(self):
-		return self._bal_check(pat=rf'{dfl_sid}:E:11\s+99987\.653431389777251448\s')
+		return self._bal_check(pat=rf'{dfl_sid}:E:11\s+99987\.653466900170247\s')
 
 	def bal4(self):
 		return self._bal_check(pat=rf'{dfl_sid}:E:12\s+4444\.3333\s')
diff --git a/test/cmdtest_d/ethdev.py b/test/cmdtest_d/ethdev.py
index 27ea6b82..3db6b061 100755
--- a/test/cmdtest_d/ethdev.py
+++ b/test/cmdtest_d/ethdev.py
@@ -233,7 +233,15 @@ class CmdTestEthdevMethods:
 		imsg(f'Computed contract address: {blue(ret)}')
 		return ret
 
-	async def _token_deploy(self, num, key, gas, mmgen_cmd='txdo', gas_price='8G', get_receipt=True):
+	async def _token_deploy(
+			self,
+			*,
+			key,
+			gas,
+			mmgen_cmd = 'txdo',
+			gas_price = '8G',
+			num = None,
+			get_receipt = True):
 		keyfile = joinpath(self.tmpdir, dfl_devkey_fn)
 		fn = joinpath(self.tmpdir, 'mm'+str(num), key+'.bin')
 		args = [
diff --git a/test/cmdtest_d/ethswap.py b/test/cmdtest_d/ethswap.py
index 0b334114..87720724 100755
--- a/test/cmdtest_d/ethswap.py
+++ b/test/cmdtest_d/ethswap.py
@@ -177,6 +177,7 @@ class CmdTestEthSwap(CmdTestSwapMethods, CmdTestRegtest):
 			'coin': 'eth',
 			'eth_daemon_id': trunner.cfg.eth_daemon_id,
 			'resume': None,
+			'resuming': None,
 			'resume_after': None,
 			'exit_after': None,
 			'log': None})
@@ -244,7 +245,7 @@ class CmdTestEthSwapEth(CmdTestEthSwapMethods, CmdTestSwapMethods, CmdTestEthdev
 
 	bals = lambda self, k: {
 		'swap1': [('98831F3A:E:1', '123.456')],
-		'swap2': [('98831F3A:E:1', '114.690978056')],
+		'swap2': [('98831F3A:E:1', '114.690979')],
 	}[k]
 
 	cmd_group_in = CmdTestEthdev.cmd_group_in + (
diff --git a/test/cmdtest_d/include/group_mgr.py b/test/cmdtest_d/include/group_mgr.py
index 4ed1d4e5..d27155af 100755
--- a/test/cmdtest_d/include/group_mgr.py
+++ b/test/cmdtest_d/include/group_mgr.py
@@ -74,7 +74,7 @@ class CmdGroupMgr:
 								added_subgroups = [sg_name] if self.cfg.deps_only else [])
 					if self.cfg.deps_only and sg_key == sg_name:
 						return
-				elif not self.cfg.skipping_deps:
+				else:
 					yield (name, data)
 
 		return tuple(gen())