mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

method rename: get_addr_label_pairs() -> get_label_addr_pairs()

Browse source
This commit is contained in:
The MMGen Project 2024-03-04 10:30:37 +00:00
commit 651f8d6192
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mmgen/proto/btc/tw/addresses.py
View file

@ -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:

4
mmgen/proto/btc/tw/ctl.py
View file

@ -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)

2
mmgen/proto/btc/tw/rpc.py
View file

@ -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.

2
mmgen/proto/btc/tw/txhistory.py
View file

@ -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...')

2
mmgen/proto/eth/tw/addresses.py
View file

@ -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,

2
mmgen/proto/eth/tw/ctl.py
View file

@ -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'])

2
mmgen/proto/eth/tw/rpc.py
View file

@ -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'])

4
mmgen/tw/ctl.py
View file

@ -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(