tx.new,tx.bump: variable rename: tx_fee -> fee

mmgen/main_txbump.py

@@ -148,7 +148,7 @@ async def main():
 	if not silent:
 		msg(f'Minimum fee for new transaction: {tx.min_fee.hl()} {tx.proto.coin}')
 
-	tx.usr_fee = tx.get_usr_fee_interactive(tx_fee=opt.fee,desc='User-selected')
+	tx.usr_fee = tx.get_usr_fee_interactive(fee=opt.fee,desc='User-selected')
 
 	tx.bump_fee(output_idx,tx.usr_fee)
 

mmgen/proto/btc/tx/bump.py

@@ -30,8 +30,8 @@ class Bump(Completed,New,TxBase.Bump):
 			self.sum_inputs() - self.sum_outputs(exclude=idx) - fee
 		)
 
-	def convert_and_check_fee(self,tx_fee,desc):
-		ret = super().convert_and_check_fee(tx_fee,desc)
+	def convert_and_check_fee(self,fee,desc):
+		ret = super().convert_and_check_fee(fee,desc)
 		if ret == False:
 			return ret
 		if ret < self.min_fee:

mmgen/proto/btc/tx/new.py

@@ -65,13 +65,13 @@ class New(Base,TxBase.New):
 			""").strip())
 		return ret
 
-	def convert_and_check_fee(self,tx_fee,desc):
-		abs_fee = self.feespec2abs(tx_fee,self.estimate_size())
+	def convert_and_check_fee(self,fee,desc):
+		abs_fee = self.feespec2abs(fee,self.estimate_size())
 		if abs_fee == None:
-			raise ValueError(f'{tx_fee}: cannot convert {self.rel_fee_desc} to {self.coin}'
+			raise ValueError(f'{fee}: cannot convert {self.rel_fee_desc} to {self.coin}'
 								+ ' because transaction size is unknown')
 		if abs_fee == False:
-			err = f'{tx_fee!r}: invalid TX fee (not a {self.coin} amount or {self.rel_fee_desc} specification)'
+			err = f'{fee!r}: invalid TX fee (not a {self.coin} amount or {self.rel_fee_desc} specification)'
 		elif abs_fee > self.proto.max_tx_fee:
 			err = f'{abs_fee} {self.coin}: {desc} fee too large (maximum fee: {self.proto.max_tx_fee} {self.coin})'
 		elif abs_fee < self.relay_fee:

mmgen/proto/eth/tx/new.py

@@ -123,8 +123,8 @@ class New(Base,TxBase.New):
 			msg(f'Estimated fee: {ret} ETH')
 		return ret
 
-	def convert_and_check_fee(self,tx_fee,desc):
-		abs_fee = self.feespec2abs(tx_fee,None)
+	def convert_and_check_fee(self,fee,desc):
+		abs_fee = self.feespec2abs(fee,None)
 		if abs_fee == False:
 			return False
 		elif not self.disable_fee_check and (abs_fee > self.proto.max_tx_fee):

mmgen/tx/new.py

@@ -95,25 +95,25 @@ class New(Base):
 
 	# given tx size and absolute fee or fee spec, return absolute fee
 	# relative fee is N+<first letter of unit name>
-	def feespec2abs(self,tx_fee,tx_size):
-		fee = get_obj(self.proto.coin_amt,num=tx_fee,silent=True)
+	def feespec2abs(self,fee_arg,tx_size):
+		fee = get_obj(self.proto.coin_amt,num=fee_arg,silent=True)
 		if fee:
 			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(tx_fee):
-				amt,unit = pat.match(tx_fee).groups()
+			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,tx_fee=None,desc='Starting'):
+	def get_usr_fee_interactive(self,fee=None,desc='Starting'):
 		abs_fee = None
 		from ..ui import line_input
 		while True:
-			if tx_fee:
-				abs_fee = self.convert_and_check_fee(tx_fee,desc)
+			if fee:
+				abs_fee = self.convert_and_check_fee(fee,desc)
 			if abs_fee:
 				prompt = '{} TX fee{}: {}{} {} ({} {})\n'.format(
 						desc,
@@ -130,7 +130,7 @@ class New(Base):
 					if opt.yes:
 						msg(prompt)
 					return abs_fee
-			tx_fee = line_input(self.usr_fee_prompt)
+			fee = line_input(self.usr_fee_prompt)
 			desc = 'User-selected'
 
 	# we don't know fee yet, so perform preliminary check with fee == 0