From 93e586c9f0a66f6bfed882770f231ebedf335bc8 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 8 Oct 2024 12:55:51 +0000 Subject: [PATCH] test suite: whitespace, string formatting --- test/cmdtest_py_d/ct_ethdev.py | 21 +++++++++++---------- test/cmdtest_py_d/ct_main.py | 6 +++--- test/cmdtest_py_d/ct_misc.py | 15 +++++++++------ test/cmdtest_py_d/ct_regtest.py | 16 ++++++++-------- test/cmdtest_py_d/ct_shared.py | 3 ++- 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/test/cmdtest_py_d/ct_ethdev.py b/test/cmdtest_py_d/ct_ethdev.py index accbcc1c..028eee55 100755 --- a/test/cmdtest_py_d/ct_ethdev.py +++ b/test/cmdtest_py_d/ct_ethdev.py @@ -691,7 +691,7 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared): def txview(self,ext_fs): ext = ext_fs.format('-α' if cfg.debug_utf8 else '') txfile = self.get_file_with_ext(ext,no_dot=True) - return self.spawn( 'mmgen-tool',['--verbose','txview',txfile] ) + return self.spawn('mmgen-tool', ['--verbose', 'txview', txfile]) def fund_dev_address(self): """ @@ -806,26 +806,26 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared): return 'ok' def msgcreate(self,add_args=[]): - t = self.spawn('mmgen-msg', self.eth_args_noquiet + add_args + [ 'create', self.message, '98831F3A:E:1' ]) + t = self.spawn('mmgen-msg', self.eth_args_noquiet + add_args + ['create', self.message, '98831F3A:E:1']) t.written_to_file('Unsigned message data') return t def msgsign(self): fn = get_file_with_ext(self.tmpdir,'rawmsg.json') - t = self.spawn('mmgen-msg', self.eth_args_noquiet + [ 'sign', fn, dfl_words_file ]) + t = self.spawn('mmgen-msg', self.eth_args_noquiet + ['sign', fn, dfl_words_file]) t.written_to_file('Signed message data') return t def msgverify(self,fn=None,msghash_type='eth_sign'): fn = fn or get_file_with_ext(self.tmpdir,'sigmsg.json') - t = self.spawn('mmgen-msg', self.eth_args_noquiet + [ 'verify', fn ]) + t = self.spawn('mmgen-msg', self.eth_args_noquiet + ['verify', fn]) t.expect(msghash_type) t.expect('1 signature verified') return t def msgexport(self): fn = get_file_with_ext(self.tmpdir,'sigmsg.json') - t = self.spawn('mmgen-msg', self.eth_args_noquiet + [ 'export', fn ]) + t = self.spawn('mmgen-msg', self.eth_args_noquiet + ['export', fn]) t.written_to_file('Signature data') return t @@ -1160,7 +1160,7 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared): def token_txcreate(self,args=[],token='',inputs='1',fee='50G',file_desc='Unsigned transaction'): return self.txcreate_ui_common( - self.spawn('mmgen-txcreate', self.txcreate_args + ['--token='+token,'-B','--fee='+fee] + args), + self.spawn('mmgen-txcreate', self.txcreate_args + [f'--token={token}', '-B', f'--fee={fee}'] + args), menu = [], inputs = inputs, input_sels_prompt = 'to spend from', @@ -1374,7 +1374,8 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared): comment_text = None, changed = False, pexpect_spawn = None): - t = self.spawn('mmgen-txcreate', self.txcreate_args + args + ['-B','-i'],pexpect_spawn=pexpect_spawn) + + t = self.spawn('mmgen-txcreate', self.txcreate_args + args + ['-B', '-i'], pexpect_spawn=pexpect_spawn) menu_prompt = 'efresh balance:\b' @@ -1451,9 +1452,9 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared): def twimport(self,add_args=[],expect_str=None): from mmgen.tw.json import TwJSON - fn = joinpath( self.tmpdir, TwJSON.Base(cfg,self.proto).dump_fn ) - t = self.spawn('mmgen-tool',self.eth_args_noquiet + ['twimport',fn] + add_args) - t.expect('(y/N): ','y') + fn = joinpath(self.tmpdir, TwJSON.Base(cfg,self.proto).dump_fn) + t = self.spawn('mmgen-tool', self.eth_args_noquiet + ['twimport', fn] + add_args) + t.expect('(y/N): ', 'y') if expect_str: t.expect(expect_str) t.written_to_file('tracking wallet data') diff --git a/test/cmdtest_py_d/ct_main.py b/test/cmdtest_py_d/ct_main.py index 83b2aab0..f7ff88fb 100755 --- a/test/cmdtest_py_d/ct_main.py +++ b/test/cmdtest_py_d/ct_main.py @@ -779,9 +779,9 @@ class CmdTestMain(CmdTestBase,CmdTestShared): stdout = wcls.type == 'seed' # capture output to screen once t = self.spawn( 'mmgen-addrgen', - (['-S'] if stdout else []) + - self.segwit_arg + - ['-i' + in_fmt, '-d', self.tmpdir, wf, self.addr_idx_list], + (['-S'] if stdout else []) + + self.segwit_arg + + ['-i' + in_fmt, '-d', self.tmpdir, wf, self.addr_idx_list], exit_val = None if stdout else 1) t.license() t.expect_getend(f'Valid {wcls.desc} for Seed ID ') diff --git a/test/cmdtest_py_d/ct_misc.py b/test/cmdtest_py_d/ct_misc.py index 98f0f2f0..2da1f5d9 100755 --- a/test/cmdtest_py_d/ct_misc.py +++ b/test/cmdtest_py_d/ct_misc.py @@ -20,12 +20,12 @@ test.cmdtest_py_d.ct_misc: Miscellaneous test groups for the cmdtest.py test suite """ -import sys,os,re,time +import sys, os, re, time from mmgen.util import ymsg, die -from ..include.common import cfg,start_test_daemons,stop_test_daemons,imsg -from .common import get_file_with_ext,dfl_words_file +from ..include.common import cfg, start_test_daemons, stop_test_daemons, imsg +from .common import get_file_with_ext, dfl_words_file from .ct_base import CmdTestBase from .ct_main import CmdTestMain @@ -209,7 +209,7 @@ class CmdTestHelp(CmdTestBase): def license(self): t = self.spawn( 'mmgen-walletconv', - ['--stdout','--in-fmt=hex','--out-fmt=hex'], + ['--stdout', '--in-fmt=hex', '--out-fmt=hex'], env = {'MMGEN_NO_LICENSE':''} ) t.expect('to continue: ', 'w') t.expect('TERMS AND CONDITIONS') # start of GPL text @@ -248,8 +248,11 @@ class CmdTestHelp(CmdTestBase): if 'autosign' in scripts and sys.platform == 'win32': scripts.remove('autosign') - for s in sorted(scripts): - t = self.spawn(f'mmgen-{s}',[arg],extra_desc=f'(mmgen-{s})') + for cmdname in sorted(scripts): + t = self.spawn( + f'mmgen-{cmdname}', + [arg], + extra_desc = f'(mmgen-{cmdname})') t.expect(expect,regex=True) if pager and t.pexpect_spawn: time.sleep(0.2) diff --git a/test/cmdtest_py_d/ct_regtest.py b/test/cmdtest_py_d/ct_regtest.py index 47262ad5..03b8451b 100755 --- a/test/cmdtest_py_d/ct_regtest.py +++ b/test/cmdtest_py_d/ct_regtest.py @@ -546,10 +546,10 @@ class CmdTestRegtest(CmdTestBase,CmdTestShared): return t def walletgen(self,user): - t = self.spawn('mmgen-walletgen',['-q','-r0','-p1','--'+user]) - t.passphrase_new('new '+dfl_wcls.desc,rt_pw) + t = self.spawn('mmgen-walletgen', ['-q', '-r0', '-p1', f'--{user}']) + t.passphrase_new(f'new {dfl_wcls.desc}', rt_pw) t.label() - t.expect('move it to the data directory? (Y/n): ','y') + t.expect('move it to the data directory? (Y/n): ', 'y') t.written_to_file(capfirst(dfl_wcls.desc)) return t @@ -586,11 +586,11 @@ class CmdTestRegtest(CmdTestBase,CmdTestShared): for mmtype in mmtypes or self.proto.mmtypes: t = self.spawn( 'mmgen-addrgen', - ['--quiet','--'+user,'--type='+mmtype,f'--outdir={self._user_dir(user)}'] + - ([wf] if wf else []) + - (['--subwallet='+subseed_idx] if subseed_idx else []) + - [addr_range], - extra_desc = '({})'.format( MMGenAddrType.mmtypes[mmtype].name )) + ['--quiet', f'--{user}', f'--type={mmtype}', f'--outdir={self._user_dir(user)}'] + + ([wf] if wf else []) + + ([f'--subwallet={subseed_idx}'] if subseed_idx else []) + + [addr_range], + extra_desc = '({})'.format(MMGenAddrType.mmtypes[mmtype].name)) t.passphrase(dfl_wcls.desc,rt_pw) t.written_to_file('Addresses') ok_msg() diff --git a/test/cmdtest_py_d/ct_shared.py b/test/cmdtest_py_d/ct_shared.py index 06cc5012..7319ae92 100755 --- a/test/cmdtest_py_d/ct_shared.py +++ b/test/cmdtest_py_d/ct_shared.py @@ -230,7 +230,8 @@ class CmdTestShared: dfl_wallet = False): hp = self.hash_preset if hasattr(self,'hash_preset') else '1' wcls = wcls or get_wallet_cls(ext=get_extension(wf)) - t = self.spawn('mmgen-walletchk', + t = self.spawn( + 'mmgen-walletchk', ([] if dfl_wallet else ['-i',wcls.fmt_codes[0]]) + add_args + ['-p',hp] + ([wf] if wf else []),