whitespace, variable renames

mmgen/proto/rune/rpc/remote.py

@@ -25,9 +25,6 @@ def process_response(json_response, errmsg):
 		return data['result']
 	return data
 
-def data_for_coin(ret, coin):
-	return next(iter([e for e in ret if e['chain'] == coin.upper()] or [None])) if coin else ret
-
 # HTTP POST, JSON-RPC response:
 class ThornodeRemoteRPCClient(RemoteJSONClient):
 	params = 'rpc_remote_rpc_params'
@@ -68,6 +65,10 @@ class THORChainRemoteRPCClient(RemoteRPCClient):
 		self.rpc_api = ThornodeRemoteRPCClient(cfg, proto)
 		self.midgard_api = ThornodeRemoteMidgardClient(cfg, proto)
 
+	@staticmethod
+	def data_for_coin(ret, coin):
+		return next(iter([e for e in ret if e['chain'] == coin.upper()] or [None])) if coin else ret
+
 	def ping(self):
 		"ping the remote REST endpoint"
 		return process_response(
@@ -88,7 +89,7 @@ class THORChainRemoteRPCClient(RemoteRPCClient):
 
 	def lastblock(self, *, coin: str=None): # noqa: RUF013
 		"get last block info for all coins or a given coin"
-		return data_for_coin(process_response(
+		return self.data_for_coin(process_response(
 			self.rest_api.get(path='/thorchain/lastblock'),
 			errmsg = 'unable to retrieve lastblock data'), coin)
 
@@ -108,7 +109,7 @@ class THORChainRemoteRPCClient(RemoteRPCClient):
 
 	def inbound_addrs(self, *, coin: str=None): # noqa: RUF013
 		"get current inbound (vault) addresses"
-		return data_for_coin(process_response(
+		return self.data_for_coin(process_response(
 			self.rest_api.get(path='/thorchain/inbound_addresses'),
 			errmsg = 'unable to retrieve inbound (vault) addresses'), coin)
 

mmgen/tx/new_swap.py

@@ -121,11 +121,11 @@ class NewSwap(New):
 
 		await parse()
 
-		for a in (self.send_asset, self.recv_asset):
-			if a.name not in sa.tested:
+		for asset in (self.send_asset, self.recv_asset):
+			if asset.name not in sa.tested:
 				from ..util import msg, ymsg
 				from ..term import get_char
-				ymsg(f'Warning: {a.direction} asset {a.name} is untested by the MMGen Project')
+				ymsg(f'Warning: {asset.direction} asset {asset.name} is untested by the MMGen Project')
 				get_char('Press any key to continue: ')
 				msg('')
 

test/cmdtest_d/httpd/thornode/rpc.py

@@ -15,23 +15,35 @@ from wsgiref.util import request_uri
 
 from . import ThornodeServer
 
-ping_info = {'ping': 'pong'}
-
-lastblock_info = [{
-		'chain': 'BTC',
-		'last_observed_in': 969302,
-		'last_signed_out': 28043381,
-		'thorchain': 28043387
-	}, {
-		'chain': 'ETH',
-		'last_observed_in': 26090346,
-		'last_signed_out': 28043381,
-		'thorchain': 28043387}]
+def get_inbounds_info():
+	with open('test/ref/thorchain/inbound.json') as fh:
+		return json.loads(fh.read())
 
 class ThornodeRPCServer(ThornodeServer):
 	port = 18800
 	name = 'thornode RPC server'
 
+	ping_info = {'ping': 'pong'}
+
+	lastblock_info = [{
+			'chain': 'BTC',
+			'last_observed_in': 969302,
+			'last_signed_out': 28043381,
+			'thorchain': 28043387
+		}, {
+			'chain': 'ETH',
+			'last_observed_in': 26090346,
+			'last_signed_out': 28043381,
+			'thorchain': 28043387}]
+
+	memo_info = {
+		'reference': '13579',
+		'asset': 'LTC.LTC',
+		'memo': '=:c:qq6myf0qd6q5tln96ntl37hq0u7940w2xvs9jsuqv0:0/3/0',
+		'height': '12345678'}
+
+	inbounds_info = get_inbounds_info()
+
 	def make_response_body(self, method, environ):
 
 		class responses:
@@ -86,14 +98,13 @@ class ThornodeRPCServer(ThornodeServer):
 				return res
 
 			def ping(m, length):
-				return ping_info
+				return self.ping_info
 
 			def lastblock(m, length):
-				return lastblock_info
+				return self.lastblock_info
 
 			def inbound_addrs(m, length):
-				with open('test/ref/thorchain/inbound.json') as fh:
-					return json.loads(fh.read())
+				return self.inbounds_info
 
 		pat_info = ( # these are matched in order, so more specific patterns must go first
 			('ping',              'GET',  r'/thorchain/ping'),

test/cmdtest_d/swap.py

@@ -293,15 +293,15 @@ class CmdTestSwap(
 	subseed_idx = '29L'
 
 	cmd_group_in = (
-		('list_assets',           'listing swap assets'),
-		('subgroup.init_swap',    []),
-		('subgroup.create',       ['init_swap']),
-		('subgroup.create_bad',   ['init_swap']),
-		('subgroup.signsend',     ['init_swap']),
-		('subgroup.signsend_bad', ['init_swap']),
-		('subgroup.autosign',     ['signsend']),
-		('stop_thornode_servers', 'stopping the Thornode RPC and swap servers'),
-		('stop',                  'stopping regtest daemons'))
+		('list_assets',              'listing swap assets'),
+		('subgroup.init_swap',       []),
+		('subgroup.create',          ['init_swap']),
+		('subgroup.create_bad',      ['init_swap']),
+		('subgroup.signsend',        ['init_swap']),
+		('subgroup.signsend_bad',    ['init_swap']),
+		('subgroup.autosign',        ['signsend']),
+		('stop_thornode_servers',    'stopping the Thornode RPC and swap servers'),
+		('stop',                     'stopping regtest daemons'))
 
 	cmd_subgroups = {
 		'init_swap': (