From 279e901d0da08b1197fa5b94fe2d11ed8ff7ae8e Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 23 May 2025 15:35:22 +0000 Subject: [PATCH] tw.view: refactor `sort_funcs` --- mmgen/proto/btc/tw/unspent.py | 8 ++++++++ mmgen/proto/eth/tw/view.py | 8 -------- mmgen/tw/view.py | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mmgen/proto/btc/tw/unspent.py b/mmgen/proto/btc/tw/unspent.py index cae96f3d..643e970c 100755 --- a/mmgen/proto/btc/tw/unspent.py +++ b/mmgen/proto/btc/tw/unspent.py @@ -63,6 +63,14 @@ class BitcoinTwUnspentOutputs(TwUnspentOutputs): 'w':'a_view_detail', 'l':'i_comment_add'} + sort_funcs = { + 'addr': lambda i: '{} {:010} {:024.12f}'.format(i.addr, 0xffffffff - abs(i.confs), i.amt), + 'age': lambda i: '{:010} {:024.12f}'.format(0xffffffff - abs(i.confs), i.amt), + 'amt': lambda i: '{:024.12f} {:010} {}'.format(i.amt, 0xffffffff - abs(i.confs), i.addr), + 'txid': lambda i: f'{i.txid} {i.vout:04}', + 'twmmid': lambda i: '{} {:010} {:024.12f}'.format( + i.twmmid.sort_key, 0xffffffff - abs(i.confs), i.amt)} + async def get_rpc_data(self): # bitcoin-cli help listunspent: # Arguments: diff --git a/mmgen/proto/eth/tw/view.py b/mmgen/proto/eth/tw/view.py index 093e0694..10cb3239 100755 --- a/mmgen/proto/eth/tw/view.py +++ b/mmgen/proto/eth/tw/view.py @@ -16,14 +16,6 @@ from ....tw.view import TwView class EthereumTwView(TwView): - sort_funcs = { - 'addr': lambda i: i.addr, - 'age': lambda i: 0 - i.confs, - 'amt': lambda i: i.amt, - 'txid': lambda i: f'{i.txid} {i.vout:04}', - 'twmmid': lambda i: i.twmmid.sort_key - } - def age_disp(self, o, age_fmt): # TODO pass diff --git a/mmgen/tw/view.py b/mmgen/tw/view.py index f991ee1e..3e3e2e75 100755 --- a/mmgen/tw/view.py +++ b/mmgen/tw/view.py @@ -243,11 +243,11 @@ class TwView(MMGenObject, metaclass=AsyncInit): } sort_funcs = { - 'addr': lambda i: '{} {:010} {:024.12f}'.format(i.addr, 0xffffffff - abs(i.confs), i.amt), - 'age': lambda i: '{:010} {:024.12f}'.format(0xffffffff - abs(i.confs), i.amt), - 'amt': lambda i: '{:024.12f} {:010} {}'.format(i.amt, 0xffffffff - abs(i.confs), i.addr), + 'addr': lambda i: i.addr, + 'age': lambda i: 0 - i.confs, + 'amt': lambda i: i.amt, 'txid': lambda i: f'{i.txid} {i.vout:04}', - 'twmmid': lambda i: '{} {:010} {:024.12f}'.format(i.twmmid.sort_key, 0xffffffff - abs(i.confs), i.amt) + 'twmmid': lambda i: i.twmmid.sort_key } def sort_info(self, *, include_group=True):