From e9e4b8f3cb70c262e9dd486ecd1f8b8ae22e31bd Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 9 Apr 2025 09:16:01 +0000 Subject: [PATCH] cmdtest ethdev: whitespace, method renames --- test/cmdtest_d/automount_eth.py | 10 +++--- test/cmdtest_d/ethbump.py | 31 ++++++++++--------- test/cmdtest_d/ethdev.py | 54 +++++++++++++++++---------------- test/cmdtest_d/ethswap.py | 4 +-- 4 files changed, 51 insertions(+), 48 deletions(-) diff --git a/test/cmdtest_d/automount_eth.py b/test/cmdtest_d/automount_eth.py index 86c070ca..24b729b4 100755 --- a/test/cmdtest_d/automount_eth.py +++ b/test/cmdtest_d/automount_eth.py @@ -28,9 +28,9 @@ class CmdTestAutosignETH(CmdTestAutosignThreaded, CmdTestEthdev, CmdTestEthdevMe ('setup', f'dev mode tests for coin {cfg.coin} (start daemon)'), ('addrgen', 'generating addresses'), ('addrimport', 'importing addresses'), - ('addrimport_dev_addr', "importing dev faucet address 'Ox00a329c..'"), - ('fund_dev_address', 'funding the default (Parity dev) address'), - ('fund_mmgen_address', 'funding an MMGen address'), + ('addrimport_devaddr', 'importing the dev address'), + ('fund_devaddr', 'funding the dev address'), + ('fund_mmgen_addr', 'funding an MMGen address'), ('create_tx', 'creating a transaction'), ('run_autosign_setup', 'running ‘autosign setup’'), ('wait_loop_start', 'starting autosign wait loop'), @@ -61,8 +61,8 @@ class CmdTestAutosignETH(CmdTestAutosignThreaded, CmdTestEthdev, CmdTestEthdevMe self.txop_opts = ['--autosign', '--regtest=1', '--quiet'] - def fund_mmgen_address(self): - return self._fund_mmgen_address(arg='98831F3A:E:1,123.456') + def fund_mmgen_addr(self): + return self._fund_mmgen_addr(arg='98831F3A:E:1,123.456') def create_tx(self): self.insert_device_online() diff --git a/test/cmdtest_d/ethbump.py b/test/cmdtest_d/ethbump.py index 1fb0f3b6..cabceeca 100755 --- a/test/cmdtest_d/ethbump.py +++ b/test/cmdtest_d/ethbump.py @@ -138,19 +138,19 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthdev, CmdTestSwapMethods): ('setup', 'dev mode transaction bumping tests for Ethereum (start daemon)'), ('addrgen', 'generating addresses'), ('addrimport', 'importing addresses'), - ('addrimport_dev_addr', 'importing dev faucet address ‘Ox00a329c..’'), - ('fund_dev_address', 'funding the default (Parity dev) address'), - ('fund_mmgen_address1', 'spend from dev address to address :1)'), - ('fund_mmgen_address2', 'spend from dev address to address :11)'), - ('fund_mmgen_address3', 'spend from dev address to address :21)'), + ('addrimport_devaddr', 'importing the dev address'), + ('fund_devaddr', 'funding the dev address'), + ('fund_mmgen_addr1', 'spend from dev address to address :1)'), + ('fund_mmgen_addr2', 'spend from dev address to address :11)'), + ('fund_mmgen_addr3', 'spend from dev address to address :21)'), ('wait1', 'waiting for block'), ), 'ltc_init': ( 'initializing LTC tracking wallet', - ('ltc_setup', 'regtest (Bob and Alice) mode setup'), - ('ltc_walletconv_bob', 'wallet generation (Bob)'), - ('ltc_addrgen_bob', 'address generation (Bob)'), - ('ltc_addrimport_bob', 'importing Bob’s addresses'), + ('ltc_setup', ''), + ('ltc_walletconv_bob', ''), + ('ltc_addrgen_bob', ''), + ('ltc_addrimport_bob', ''), ), 'feebump': ( 'creating, signing, sending, bumping and resending a transaction (fee-bump only)', @@ -253,14 +253,14 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthdev, CmdTestSwapMethods): thornode_server.start() - def fund_mmgen_address1(self): - return self._fund_mmgen_address(arg=f'{dfl_sid}:E:1,100000') + def fund_mmgen_addr1(self): + return self._fund_mmgen_addr(arg=f'{dfl_sid}:E:1,100000') - def fund_mmgen_address2(self): - return self._fund_mmgen_address(arg=f'{dfl_sid}:E:11,100000') + def fund_mmgen_addr2(self): + return self._fund_mmgen_addr(arg=f'{dfl_sid}:E:11,100000') - def fund_mmgen_address3(self): - return self._fund_mmgen_address(arg=f'{dfl_sid}:E:21,100000') + def fund_mmgen_addr3(self): + return self._fund_mmgen_addr(arg=f'{dfl_sid}:E:21,100000') def txcreate1(self): return self._txcreate(args=[f'{burn_addr},987'], acct='1') @@ -377,6 +377,7 @@ class CmdTestEthBumpLTC(CmdTestRegtest, CmdTestSwapMethods): network = ('ltc',) tmpdir_nums = [43] cmd_group_in = CmdTestRegtest.cmd_group_in + ( + ('setup', 'LTC regtest setup'), ('walletconv_bob', 'LTC wallet generation'), ('addrgen_bob', 'LTC address generation'), ('addrimport_bob', 'importing LTC addresses'), diff --git a/test/cmdtest_d/ethdev.py b/test/cmdtest_d/ethdev.py index 848bacc4..5d2a7588 100755 --- a/test/cmdtest_d/ethdev.py +++ b/test/cmdtest_d/ethdev.py @@ -70,6 +70,7 @@ dfl_sid = '98831F3A' # The OpenEthereum dev address with lots of coins. Create with "ethkey -b info ''": dfl_devaddr = '00a329c0648769a73afac7f9381e08fb43dbea72' dfl_devkey = '4d5db4107d237df6a3d58ee5f70ae63d73d7658d4026f2eefd2f204c81682cb7' +dfl_devkey_fn = 'dfl.devkey' def get_reth_dev_keypair(cfg): from mmgen.bip39 import bip39 @@ -86,8 +87,6 @@ burn_addr2 = 'beadcafe'*5 amt1 = '999777.12345689012345678' amt2 = '888.111122223333444455' -parity_devkey_fn = 'parity.devkey' - def set_vbals(daemon_id): global vbal1, vbal2, vbal3, vbal4, vbal5, vbal6, vbal7, vbal9 if daemon_id == 'geth': @@ -124,6 +123,11 @@ coin = cfg.coin class CmdTestEthdevMethods: # mixin class + def _del_addr(self, addr): + t = self.spawn('mmgen-tool', self.eth_opts + ['remove_address', addr]) + t.expect(f"'{addr}' deleted") + return t + def _addrgen(self, addrs='1-3,11-13,21-23', no_msg=False): t = self.spawn( 'mmgen-addrgen', @@ -179,9 +183,9 @@ class CmdTestEthdevMethods: # mixin class return_early = True, env = cleanup_env(cfg=self.cfg)) - def _fund_mmgen_address(self, arg): + def _fund_mmgen_addr(self, arg): return self._txdo( - args = [f'--keys-from-file={joinpath(self.tmpdir, parity_devkey_fn)}', arg, dfl_words_file], + args = [f'--keys-from-file={joinpath(self.tmpdir, dfl_devkey_fn)}', arg, dfl_words_file], acct = '10') def _bal_check(self, *, pat, add_opts=[]): @@ -218,7 +222,7 @@ class CmdTestEthdevMethods: # mixin class return ret async def _token_deploy(self, num, key, gas, mmgen_cmd='txdo', gas_price='8G', get_receipt=True): - keyfile = joinpath(self.tmpdir, parity_devkey_fn) + keyfile = joinpath(self.tmpdir, dfl_devkey_fn) fn = joinpath(self.tmpdir, 'mm'+str(num), key+'.bin') args = [ '-B', @@ -437,13 +441,13 @@ class CmdTestEthdev(CmdTestBase, CmdTestShared, CmdTestEthdevMethods): ), 'init': ( 'initializing wallets', - ('wallet_upgrade1', 'upgrading the tracking wallet (v1 -> v2)'), - ('wallet_upgrade2', 'upgrading the tracking wallet (v2 -> v3)'), - ('addrgen', 'generating addresses'), - ('addrimport', 'importing addresses'), - ('addrimport_dev_addr', "importing dev faucet address 'Ox00a329c..'"), - ('fund_dev_address', 'funding the default (Parity dev) address'), - ('cli_dev_balance', 'mmgen-cli eth_getBalance'), + ('wallet_upgrade1', 'upgrading the tracking wallet (v1 -> v2)'), + ('wallet_upgrade2', 'upgrading the tracking wallet (v2 -> v3)'), + ('addrgen', 'generating addresses'), + ('addrimport', 'importing addresses'), + ('addrimport_devaddr', 'importing the dev address'), + ('fund_devaddr', 'funding the dev address'), + ('cli_dev_balance', 'mmgen-cli eth_getBalance'), ), 'msg': ( 'message signing', @@ -556,7 +560,7 @@ class CmdTestEthdev(CmdTestBase, CmdTestShared, CmdTestEthdevMethods): ('token_txsend2', 'sending the transaction'), ('token_bal3', f'the {coin} balance and token balance'), - ('del_dev_addr', 'deleting the dev address'), + ('del_devaddr', 'deleting the dev address'), ('bal1_getbalance', f'the {coin} balance (getbalance)'), @@ -684,7 +688,7 @@ class CmdTestEthdev(CmdTestBase, CmdTestShared, CmdTestEthdevMethods): self.keystore_dir = os.path.relpath(joinpath(self.daemon.datadir, 'keystore')) write_to_file( - joinpath(self.tmpdir, parity_devkey_fn), + joinpath(self.tmpdir, dfl_devkey_fn), dfl_devkey+'\n') self.message = 'attack at dawn' @@ -895,16 +899,16 @@ class CmdTestEthdev(CmdTestBase, CmdTestShared, CmdTestEthdevMethods): t.expect(expect) return t - def addrimport_one_addr(self, addr=None, extra_args=[]): + def _addrimport_one_addr(self, addr=None, extra_args=[]): t = self.spawn('mmgen-addrimport', ['--regtest=1', '--quiet', f'--address={addr}'] + extra_args) t.expect('OK') return t - def addrimport_dev_addr(self): - return self.addrimport_one_addr(addr=dfl_devaddr) + def addrimport_devaddr(self): + return self._addrimport_one_addr(addr=dfl_devaddr) def addrimport_burn_addr(self): - return self.addrimport_one_addr(addr=burn_addr) + return self._addrimport_one_addr(addr=burn_addr) def txcreate( self, @@ -942,7 +946,7 @@ class CmdTestEthdev(CmdTestBase, CmdTestShared, CmdTestEthdevMethods): def txsign(self, ni=False, ext='{}.regtest.rawtx', add_args=[], dev_send=False, has_label=True): ext = ext.format('-α' if self.cfg.debug_utf8 else '') - keyfile = joinpath(self.tmpdir, parity_devkey_fn) + keyfile = joinpath(self.tmpdir, dfl_devkey_fn) txfile = self.get_file_with_ext(ext, no_dot=True) t = self.spawn( 'mmgen-txsign', @@ -985,13 +989,13 @@ class CmdTestEthdev(CmdTestBase, CmdTestShared, CmdTestEthdevMethods): txfile = self.get_file_with_ext(ext, no_dot=True) return self.spawn('mmgen-tool', ['--verbose', 'txview', txfile]) - def fund_dev_address(self): + def fund_devaddr(self): """ For Erigon, fund the default (Parity) dev address from the Erigon dev address For the others, send a junk TX to keep block counts equal for all daemons """ dt = namedtuple('data', ['devkey_fn', 'dest', 'amt']) - d = dt(parity_devkey_fn, burn_addr2, '1') + d = dt(dfl_devkey_fn, burn_addr2, '1') t = self.txcreate( args = self.eth_opts_noquiet + [ f'--keys-from-file={joinpath(self.tmpdir, d.devkey_fn)}', @@ -1445,16 +1449,14 @@ class CmdTestEthdev(CmdTestBase, CmdTestShared, CmdTestEthdevMethods): def token_bal3(self): return self.token_bal(n='3') - def del_dev_addr(self): - t = self.spawn('mmgen-tool', self.eth_opts + ['remove_address', dfl_devaddr]) - t.expect(f"'{dfl_devaddr}' deleted") - return t + def del_devaddr(self): + return self._del_addr(dfl_devaddr) def bal1_getbalance(self): return self.bal_getbalance(dfl_sid, '1', etc_adj=True) def addrimport_token_burn_addr(self): - return self.addrimport_one_addr(addr=burn_addr, extra_args=['--token=mm1']) + return self._addrimport_one_addr(addr=burn_addr, extra_args=['--token=mm1']) def token_bal4(self): return self.token_bal(n='4') diff --git a/test/cmdtest_d/ethswap.py b/test/cmdtest_d/ethswap.py index 79497979..5e47fe8d 100755 --- a/test/cmdtest_d/ethswap.py +++ b/test/cmdtest_d/ethswap.py @@ -71,8 +71,8 @@ class CmdTestEthSwap(CmdTestRegtest, CmdTestSwapMethods): 'initializing the ETH tracking wallet', ('eth_addrgen', ''), ('eth_addrimport', ''), - ('eth_addrimport_dev_addr', ''), - ('eth_fund_dev_address', ''), + ('eth_addrimport_devaddr', ''), + ('eth_fund_devaddr', ''), ), 'eth_fund': ( 'funding the ETH tracking wallet',