From 0924928ef31cff72bbfefde018c04d0ea807eb89 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 18 Oct 2024 10:32:05 +0000 Subject: [PATCH] tx.feespec2abs(): cleanup --- mmgen/tx/new.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mmgen/tx/new.py b/mmgen/tx/new.py index 8f5c4ab0..cdf3d023 100755 --- a/mmgen/tx/new.py +++ b/mmgen/tx/new.py @@ -110,16 +110,17 @@ class New(Base): # given tx size and absolute fee or fee spec, return absolute fee # relative fee is N+ def feespec2abs(self, fee_arg, tx_size): - fee = get_obj(self.proto.coin_amt, num=fee_arg, silent=True) - if fee: + + if fee := get_obj(self.proto.coin_amt, num=fee_arg, silent=True): return fee - else: - import re - units = {u[0]:u for u in self.proto.coin_amt.units} - pat = re.compile(r'([1-9][0-9]*)({})'.format('|'.join(units))) - if pat.match(fee_arg): - amt, unit = pat.match(fee_arg).groups() - return self.fee_rel2abs(tx_size, units, int(amt), unit) + + import re + units = {u[0]:u for u in self.proto.coin_amt.units} + pat = re.compile(r'([1-9][0-9]*)({})'.format('|'.join(units))) + if pat.match(fee_arg): + amt, unit = pat.match(fee_arg).groups() + return self.fee_rel2abs(tx_size, units, int(amt), unit) + return False def get_usr_fee_interactive(self, fee=None, desc='Starting'):