From dc3df437ab26e3c9537df846024770c7f721338d Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 1 Oct 2025 15:30:56 +0000 Subject: [PATCH] cmdtest.py: make test methods async where applicable --- test/cmdtest_d/automount_eth.py | 4 ++-- test/cmdtest_d/ethbump.py | 12 +++++----- test/cmdtest_d/ethdev.py | 8 +++---- test/cmdtest_d/ethswap.py | 8 +++---- test/cmdtest_d/regtest.py | 8 +++---- test/cmdtest_d/xmr_autosign.py | 42 +++++++++++++++------------------ test/cmdtest_d/xmrwallet.py | 20 ++++++++-------- 7 files changed, 49 insertions(+), 53 deletions(-) diff --git a/test/cmdtest_d/automount_eth.py b/test/cmdtest_d/automount_eth.py index f7f1f20b..e34e4f9e 100755 --- a/test/cmdtest_d/automount_eth.py +++ b/test/cmdtest_d/automount_eth.py @@ -91,8 +91,8 @@ class CmdTestAutosignETH(CmdTestAutosignThreaded, CmdTestEthdev, CmdTestEthdevMe def token_addrimport(self): return self._token_addrimport('token_addr1', '11-13', expect='3/3') - def token_fund_user(self): - return self._token_transfer_ops(op='fund_user', mm_idxs=[11]) + async def token_fund_user(self): + return await self._token_transfer_ops(op='fund_user', mm_idxs=[11]) def token_bal1(self): return self._token_bal_check(pat=r':E:11\s+1000\s+54\.321\s+') diff --git a/test/cmdtest_d/ethbump.py b/test/cmdtest_d/ethbump.py index 3f95e8ae..59254515 100755 --- a/test/cmdtest_d/ethbump.py +++ b/test/cmdtest_d/ethbump.py @@ -70,8 +70,8 @@ class CmdTestEthBumpMethods: fee_desc = 'or gas price', bad_fee = '0.9G') - def _token_fund_user(self, *, mm_idxs): - return self._token_transfer_ops( + async def _token_fund_user(self, *, mm_idxs): + return await self._token_transfer_ops( op = 'fund_user', mm_idxs = mm_idxs, token_addr = 'token_addr1', @@ -330,11 +330,11 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthSwapMethods, CmdTestSwapMe def bal4(self): return self._bal_check(pat=rf'{dfl_sid}:E:12\s+4444\.3333\s') - def token_fund_user1(self): - return self._token_fund_user(mm_idxs=[1]) + async def token_fund_user1(self): + return await self._token_fund_user(mm_idxs=[1]) - def token_fund_user11(self): - return self._token_fund_user(mm_idxs=[11]) + async def token_fund_user11(self): + return await self._token_fund_user(mm_idxs=[11]) def token_txdo1(self): return self._token_txcreate(cmd='txdo', args=[f'{dfl_sid}:E:2,1.23456', dfl_words_file]) diff --git a/test/cmdtest_d/ethdev.py b/test/cmdtest_d/ethdev.py index 6e175c19..f9061cbd 100755 --- a/test/cmdtest_d/ethdev.py +++ b/test/cmdtest_d/ethdev.py @@ -1390,11 +1390,11 @@ class CmdTestEthdev(CmdTestEthdevMethods, CmdTestBase, CmdTestShared): def bal6(self): return self.bal5() - def token_fund_users(self): - return self._token_transfer_ops(op='fund_user', mm_idxs=[11, 21]) + async def token_fund_users(self): + return await self._token_transfer_ops(op='fund_user', mm_idxs=[11, 21]) - def token_user_bals(self): - return self._token_transfer_ops(op='show_bals', mm_idxs=[11, 21]) + async def token_user_bals(self): + return await self._token_transfer_ops(op='show_bals', mm_idxs=[11, 21]) def token_addrgen(self): return self._token_addrgen(mm_idxs=[11, 21], naddrs=3) diff --git a/test/cmdtest_d/ethswap.py b/test/cmdtest_d/ethswap.py index 4af59fd3..9011234d 100755 --- a/test/cmdtest_d/ethswap.py +++ b/test/cmdtest_d/ethswap.py @@ -71,8 +71,8 @@ class CmdTestEthSwapMethods: gas = 1_000_000, fn = f'{self.tmpdir}/THORChain_Router.bin') - def token_fund_user(self): - return self._token_transfer_ops( + async def token_fund_user(self): + return await self._token_transfer_ops( op = 'fund_user', mm_idxs = [1, 2, 12], token_addr = 'token_addr1', @@ -445,10 +445,10 @@ class CmdTestEthSwapEth(CmdTestEthSwapMethods, CmdTestSwapMethods, CmdTestEthdev def swaptxstatus1(self): return self._swaptxsend(add_opts=['--verbose', '--status'], status=True) - def swaptxmemo4(self): + async def swaptxmemo4(self): import time time.sleep(1) - return self._check_token_swaptx_memo('=:b:mkQsXA7mqDtnUpkaXMbDtAL1KMeof4GPw3:0/3/0') + return await self._check_token_swaptx_memo('=:b:mkQsXA7mqDtnUpkaXMbDtAL1KMeof4GPw3:0/3/0') def swaptxreceipt4(self): return self._swaptxsend(add_opts=['--receipt'], spawn_only=True) diff --git a/test/cmdtest_d/regtest.py b/test/cmdtest_d/regtest.py index 89e3d7ba..7cda4b06 100755 --- a/test/cmdtest_d/regtest.py +++ b/test/cmdtest_d/regtest.py @@ -719,14 +719,14 @@ class CmdTestRegtest(CmdTestBase, CmdTestShared): tweaks = ['confirm_chg_non_mmgen'], skip_passphrase = skip_passphrase) - def fund_bob_deterministic(self): - return self.fund_wallet_deterministic(f'{self._user_sid("bob")}:C:1', '1-11') + async def fund_bob_deterministic(self): + return await self.fund_wallet_deterministic(f'{self._user_sid("bob")}:C:1', '1-11') - def fund_alice_deterministic(self): + async def fund_alice_deterministic(self): sid = self._user_sid('alice') mmtype = ('L', 'S')[self.proto.cap('segwit')] addr = self.get_addr_from_addrlist('alice', sid, mmtype, 0, addr_range='1-5') - return self.fund_wallet_deterministic(addr, '1-11', skip_passphrase=True) + return await self.fund_wallet_deterministic(addr, '1-11', skip_passphrase=True) def generate_extra_deterministic(self): if not self.deterministic: diff --git a/test/cmdtest_d/xmr_autosign.py b/test/cmdtest_d/xmr_autosign.py index b9e13799..0e73f00a 100755 --- a/test/cmdtest_d/xmr_autosign.py +++ b/test/cmdtest_d/xmr_autosign.py @@ -214,17 +214,17 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded): def delete_dump_files(self): return self._delete_files('.dump') - def fund_alice1(self): - return self.fund_alice(wallet=1) + async def fund_alice1(self): + return await self.fund_alice(wallet=1) - def check_bal_alice1(self): - return self.check_bal_alice(wallet=1) + async def check_bal_alice1(self): + return await self.check_bal_alice(wallet=1) - def fund_alice2(self): - return self.fund_alice(wallet=2) + async def fund_alice2(self): + return await self.fund_alice(wallet=2) - def check_bal_alice2(self): - return self.check_bal_alice(wallet=2) + async def check_bal_alice2(self): + return await self.check_bal_alice(wallet=2) def autosign_setup(self): return self.run_setup( @@ -340,26 +340,19 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded): '1-2', lambda n, b, ub: b == ub and ((n == 1 and 0.8 < b < 0.86) or (n == 2 and b > 1.23))) - def _mine_chk(self, desc): - bal_type = {'locked':'b', 'unlocked':'ub'}[desc] - return self.mine_chk( - 'alice', 1, 0, - lambda x: 0 < getattr(x, bal_type) < 1.234567891234, - f'{desc} balance 0 < 1.234567891234') + async def submit_transfer_tx1(self): + return await self._submit_transfer_tx() - def submit_transfer_tx1(self): - return self._submit_transfer_tx() - - def resubmit_transfer_tx1(self): - return self._submit_transfer_tx( + async def resubmit_transfer_tx1(self): + return await self._submit_transfer_tx( relay_parm = self.tx_relay_daemon_proxy_parm, op = 'resubmit', check_bal = False) - def submit_transfer_tx2(self): - return self._submit_transfer_tx(relay_parm=self.tx_relay_daemon_parm) + async def submit_transfer_tx2(self): + return await self._submit_transfer_tx(relay_parm=self.tx_relay_daemon_parm) - def _submit_transfer_tx(self, relay_parm=None, ext=None, op='submit', check_bal=True): + async def _submit_transfer_tx(self, relay_parm=None, ext=None, op='submit', check_bal=True): t = self._xmr_autosign_op( op = op, add_opts = [f'--tx-relay-daemon={relay_parm}'] if relay_parm else [], @@ -372,7 +365,10 @@ class CmdTestXMRAutosign(CmdTestXMRWallet, CmdTestAutosignThreaded): self.remove_device_online() # device was inserted by _xmr_autosign_op() if check_bal: t.ok() - return self._mine_chk('unlocked') + return await self.mine_chk( + 'alice', 1, 0, + lambda x: 0 < x.ub < 1.234567891234, + 'unlocked balance 0 < 1.234567891234') else: return t diff --git a/test/cmdtest_d/xmrwallet.py b/test/cmdtest_d/xmrwallet.py index 67ea4dae..83bc94f2 100755 --- a/test/cmdtest_d/xmrwallet.py +++ b/test/cmdtest_d/xmrwallet.py @@ -505,25 +505,25 @@ class CmdTestXMRWallet(CmdTestBase): return t if do_ret else t.ok() - def sweep_to_wallet(self): + async def sweep_to_wallet(self): self.do_op('sweep', 'alice', '1:0,2') - return self.mine_chk('alice', 2, 1, lambda x: x.ub > 1, 'unlocked balance > 1') + return await self.mine_chk('alice', 2, 1, lambda x: x.ub > 1, 'unlocked balance > 1') - def sweep_to_account(self): + async def sweep_to_account(self): self.do_op('sweep', 'alice', '2:1,2:0', use_existing=True) - return self.mine_chk('alice', 2, 0, lambda x: x.ub > 1, 'unlocked balance > 1') + return await self.mine_chk('alice', 2, 0, lambda x: x.ub > 1, 'unlocked balance > 1') - def sweep_to_wallet_account(self): + async def sweep_to_wallet_account(self): self.do_op('sweep', 'alice', '2:0,3:0', use_existing=True, add_opts=['-Ee', '--full-address']) - return self.mine_chk('alice', 3, 0, lambda x: x.ub > 1, 'unlocked balance > 1') + return await self.mine_chk('alice', 3, 0, lambda x: x.ub > 1, 'unlocked balance > 1') - def sweep_to_wallet_account_proxy(self): + async def sweep_to_wallet_account_proxy(self): self.do_op('sweep', 'alice', '3:0,2:1', self.tx_relay_daemon_proxy_parm, add_opts=['--priority=3', '-Ee']) - return self.mine_chk('alice', 2, 1, lambda x: x.ub > 1, 'unlocked balance > 1') + return await self.mine_chk('alice', 2, 1, lambda x: x.ub > 1, 'unlocked balance > 1') - def sweep_to_same_account_noproxy(self): + async def sweep_to_same_account_noproxy(self): self.do_op('sweep', 'alice', '2:1', self.tx_relay_daemon_parm) - return self.mine_chk('alice', 2, 1, lambda x: x.ub > 0.9, 'unlocked balance > 0.9') + return await self.mine_chk('alice', 2, 1, lambda x: x.ub > 0.9, 'unlocked balance > 0.9') async def transfer_to_miner_proxy(self): addr = read_from_file(self.users['miner'].addrfile_fs.format(2))