From 651f8d61925b8fa0583253f8879fca63e872af03 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 4 Mar 2024 10:30:37 +0000 Subject: [PATCH] method rename: `get_addr_label_pairs()` -> `get_label_addr_pairs()` --- mmgen/proto/btc/tw/addresses.py | 2 +- mmgen/proto/btc/tw/ctl.py | 4 ++-- mmgen/proto/btc/tw/rpc.py | 2 +- mmgen/proto/btc/tw/txhistory.py | 2 +- mmgen/proto/eth/tw/addresses.py | 2 +- mmgen/proto/eth/tw/ctl.py | 2 +- mmgen/proto/eth/tw/rpc.py | 2 +- mmgen/tw/ctl.py | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mmgen/proto/btc/tw/addresses.py b/mmgen/proto/btc/tw/addresses.py index 228245ff..efe8839d 100755 --- a/mmgen/proto/btc/tw/addresses.py +++ b/mmgen/proto/btc/tw/addresses.py @@ -53,7 +53,7 @@ Actions: [q]uit menu, r[e]draw, add [l]abel: self.total = sum((v['amt'] for v in addrs.values()), start=amt0) msg_r('Getting labels and associated addresses...') - pairs = await self.get_addr_label_pairs() + pairs = await self.get_label_addr_pairs() if pairs: for label,addr in pairs: diff --git a/mmgen/proto/btc/tw/ctl.py b/mmgen/proto/btc/tw/ctl.py index a9aa8cfc..f0f9713e 100755 --- a/mmgen/proto/btc/tw/ctl.py +++ b/mmgen/proto/btc/tw/ctl.py @@ -125,6 +125,6 @@ class BitcoinTwCtl(TwCtl): 'Addresses have no balances' ) return True - async def get_addr_label_pairs(self, twmmid): + async def get_label_addr_pairs(self, twmmid): from .rpc import TwRPC - return await TwRPC(proto=self.proto, rpc=self.rpc, twctl=self).get_addr_label_pairs(twmmid) + return await TwRPC(proto=self.proto, rpc=self.rpc, twctl=self).get_label_addr_pairs(twmmid) diff --git a/mmgen/proto/btc/tw/rpc.py b/mmgen/proto/btc/tw/rpc.py index d49d8a09..4565395d 100755 --- a/mmgen/proto/btc/tw/rpc.py +++ b/mmgen/proto/btc/tw/rpc.py @@ -19,7 +19,7 @@ from ....tw.rpc import TwRPC class BitcoinTwRPC(TwRPC): - async def get_addr_label_pairs(self,twmmid=None): + async def get_label_addr_pairs(self, twmmid=None): """ Get all the accounts in the tracking wallet and their associated addresses. Returns list of (label,address) tuples. diff --git a/mmgen/proto/btc/tw/txhistory.py b/mmgen/proto/btc/tw/txhistory.py index 4fcadc6b..5009ba83 100755 --- a/mmgen/proto/btc/tw/txhistory.py +++ b/mmgen/proto/btc/tw/txhistory.py @@ -312,7 +312,7 @@ Filters/Actions: show [u]nconfirmed, [q]uit menu, r[e]draw: if self.sinceblock: # mapping data may be incomplete for inputs, so update from 'listlabels' mm_map.update( { addr: _mmp(label.mmid, label.comment) if label else _mmp(None,None) - for label,addr in await self.get_addr_label_pairs() } + for label, addr in await self.get_label_addr_pairs() } ) msg_r('Getting wallet transactions...') diff --git a/mmgen/proto/eth/tw/addresses.py b/mmgen/proto/eth/tw/addresses.py index 2831112d..e18f3f4e 100755 --- a/mmgen/proto/eth/tw/addresses.py +++ b/mmgen/proto/eth/tw/addresses.py @@ -71,7 +71,7 @@ Actions: [q]uit menu, r[e]draw, [D]elete addr, add [l]abel: self.minconf = None addrs = {} - for label,addr in await self.get_addr_label_pairs(): + for label, addr in await self.get_label_addr_pairs(): bal = await self.twctl.get_balance(addr) addrs[label.mmid] = { 'addr': addr, diff --git a/mmgen/proto/eth/tw/ctl.py b/mmgen/proto/eth/tw/ctl.py index 7572751a..87ea894e 100755 --- a/mmgen/proto/eth/tw/ctl.py +++ b/mmgen/proto/eth/tw/ctl.py @@ -166,7 +166,7 @@ class EthereumTwCtl(TwCtl): def mmid_ordered_dict(self): return dict((x['mmid'],{'addr':x['addr'],'comment':x['comment']}) for x in self.sorted_list) - async def get_addr_label_pairs(self,twmmid): + async def get_label_addr_pairs(self, twmmid): ret = [( TwLabel(self.proto, mmid + ' ' + d['comment']), CoinAddr(self.proto, d['addr']) diff --git a/mmgen/proto/eth/tw/rpc.py b/mmgen/proto/eth/tw/rpc.py index f9439932..2d22f1d0 100755 --- a/mmgen/proto/eth/tw/rpc.py +++ b/mmgen/proto/eth/tw/rpc.py @@ -18,7 +18,7 @@ from ....tw.rpc import TwRPC class EthereumTwRPC(TwRPC): - async def get_addr_label_pairs(self): + async def get_label_addr_pairs(self): return [( TwLabel(self.proto, mmid + ' ' + d['comment']), CoinAddr(self.proto, d['addr']) diff --git a/mmgen/tw/ctl.py b/mmgen/tw/ctl.py index ff39dd13..5863ab5b 100755 --- a/mmgen/tw/ctl.py +++ b/mmgen/tw/ctl.py @@ -227,7 +227,7 @@ class TwCtl(MMGenObject,metaclass=AsyncInit): msg(f'{addrspec!r}: invalid address for this network') return None - pairs = await self.get_addr_label_pairs(twmmid) + pairs = await self.get_label_addr_pairs(twmmid) if not pairs: msg(f'MMGen address {twmmid!r} not found in tracking wallet') @@ -277,7 +277,7 @@ class TwCtl(MMGenObject,metaclass=AsyncInit): if await self.set_label(res.coinaddr,lbl): # redundant paranoia step: - pairs = await self.get_addr_label_pairs(res.twmmid) + pairs = await self.get_label_addr_pairs(res.twmmid) assert pairs[0][0].comment == comment, f'{pairs[0][0].comment!r} != {comment!r}' if not silent: desc = '{} address {} in tracking wallet'.format(