From d94739de36383c41ea1c4ee3b934da2a30b524db Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 23 May 2023 12:12:30 +0000 Subject: [PATCH] ts_ethdev: minor variable renames --- test/test_py_d/ts_ethdev.py | 14 +++++++------- test/test_py_d/ts_shared.py | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py index aff2cc93..a73a5dc7 100755 --- a/test/test_py_d/ts_ethdev.py +++ b/test/test_py_d/ts_ethdev.py @@ -579,11 +579,11 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): caller = 'txcreate', interactive_fee = '50G', eth_fee_res = None, - fee_res_data = ('0.00105','50'), + fee_info_data = ('0.00105','50'), fee_desc = 'gas price', no_read = False, tweaks = [] ): - fee_res = r'\D{}\D.*{c} .*\D{}\D.*gas price in Gwei'.format( *fee_res_data, c=self.proto.coin ) + fee_info_pat = r'\D{}\D.*{c} .*\D{}\D.*gas price in Gwei'.format( *fee_info_data, c=self.proto.coin ) t = self.spawn('mmgen-'+caller, self.eth_args + ['-B'] + args) t.expect(r'add \[l\]abel, .*?:.','p', regex=True) t.written_to_file('Account balances listing') @@ -595,7 +595,7 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): file_desc = 'transaction', bad_input_sels = True, interactive_fee = interactive_fee, - fee_res = fee_res, + fee_info_pat = fee_info_pat, fee_desc = fee_desc, eth_fee_res = eth_fee_res, add_comment = tx_comment_jp, @@ -787,7 +787,7 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): args = ['98831F3A:E:2,23.45495'], acct = '1', interactive_fee = '40G', - fee_res_data = ('0.00084','40'), + fee_info_data = ('0.00084','40'), eth_fee_res = True ) def txbump(self,ext=',40000]{}.regtest.rawtx',fee='50G',add_args=[]): @@ -1192,10 +1192,10 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): def txdo_cached_balances(self, acct = '2', - fee_res_data = ('0.00105','50'), + fee_info_data = ('0.00105','50'), add_args = ['98831F3A:E:3,0.4321']): args = ['--fee=20G','--cached-balances'] + add_args + [dfl_words_file] - t = self.txcreate(args=args,acct=acct,caller='txdo',fee_res_data=fee_res_data,no_read=True) + t = self.txcreate(args=args,acct=acct,caller='txdo',fee_info_data=fee_info_data,no_read=True) self._do_confirm_send(t,quiet=not cfg.debug,sure=False) return t @@ -1225,7 +1225,7 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): def token_txdo_cached_balances(self): return self.txdo_cached_balances( acct='1', - fee_res_data=('0.0026','50'), + fee_info_data=('0.0026','50'), add_args=['--token=mm1','98831F3A:E:12,43.21']) def token_txcreate_refresh_balances(self): diff --git a/test/test_py_d/ts_shared.py b/test/test_py_d/ts_shared.py index c02a5a73..fc0f2e43 100755 --- a/test/test_py_d/ts_shared.py +++ b/test/test_py_d/ts_shared.py @@ -39,7 +39,7 @@ class TestSuiteShared(object): bad_input_sels = False, interactive_fee = '', fee_desc = 'transaction fee', - fee_res = None, + fee_info_pat = None, eth_fee_res = None, add_comment = '', view = 't', @@ -91,8 +91,8 @@ class TestSuiteShared(object): t.expect('fee: ',interactive_fee+'\n') else: t.send(interactive_fee+'\n') - if fee_res: - t.expect(fee_res,regex=True) + if fee_info_pat: + t.expect(fee_info_pat,regex=True) t.expect('OK? (Y/n): ','y') t.expect('(Y/n): ','\n') # chg amt OK?