From f1888658d0bff9b198fe17e144893af3c928afd4 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 18 Oct 2024 10:32:06 +0000 Subject: [PATCH] remove some unused code --- mmgen/proto/btc/tx/new.py | 5 +---- mmgen/xmrwallet.py | 9 --------- test/cmdtest_py_d/ct_regtest.py | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/mmgen/proto/btc/tx/new.py b/mmgen/proto/btc/tx/new.py index 295fd052..39ece728 100755 --- a/mmgen/proto/btc/tx/new.py +++ b/mmgen/proto/btc/tx/new.py @@ -65,10 +65,7 @@ class New(Base,TxBase.New): # given tx size, rel fee and units, return absolute fee def fee_rel2abs(self, tx_size, units, amt_in_units, unit): - if tx_size: - return self.proto.coin_amt(amt_in_units * tx_size, from_unit=units[unit]) - else: - return None + return self.proto.coin_amt(amt_in_units * tx_size, from_unit=units[unit]) # given network fee estimate in BTC/kB, return absolute fee using estimated tx size def fee_est2abs(self,fee_per_kb,fe_type=None): diff --git a/mmgen/xmrwallet.py b/mmgen/xmrwallet.py index 9d4f5767..53dd66e0 100755 --- a/mmgen/xmrwallet.py +++ b/mmgen/xmrwallet.py @@ -154,15 +154,6 @@ class XMRWalletAddrSpec(HiliteStr,InitErrors,MMGenObject): except Exception as e: return cls.init_fail(e,me) -def is_xmr_tx_file(cfg,fn): - try: - MoneroMMGenTX.Completed(cfg,fn) - return True - except Exception as e: - if not 'MoneroMMGenTXFileParseError' in type(e).__name__: - ymsg(f'\n{type(e).__name__}: {e}') - return False - class MoneroMMGenFile: silent_load = False diff --git a/test/cmdtest_py_d/ct_regtest.py b/test/cmdtest_py_d/ct_regtest.py index a0206a0c..260e544e 100755 --- a/test/cmdtest_py_d/ct_regtest.py +++ b/test/cmdtest_py_d/ct_regtest.py @@ -1124,7 +1124,7 @@ class CmdTestRegtest(CmdTestBase,CmdTestShared): def alice_send_estimatefee(self): outputs_cl = self._create_tx_outputs('bob',(('L',1,''),)) # bob_sid:L:1 - return self.user_txdo('alice',None,outputs_cl,'1') # fee=None + return self.user_txdo('alice', None, outputs_cl, '1', extra_args=['--verbose']) # fee=None def user_txbump( self,