From 112f2cd5399dba2750075ecb49b190401ea861d8 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 24 Nov 2025 12:48:48 +0000 Subject: [PATCH] tw.view: get_data(), sort_data(): remove keyword params --- mmgen/proto/eth/tw/unspent.py | 4 ++-- mmgen/tool/rpc.py | 3 ++- mmgen/tw/view.py | 8 +++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mmgen/proto/eth/tw/unspent.py b/mmgen/proto/eth/tw/unspent.py index fa4d97da..372a6d7f 100755 --- a/mmgen/proto/eth/tw/unspent.py +++ b/mmgen/proto/eth/tw/unspent.py @@ -34,7 +34,7 @@ class EthereumTokenTwUnspentOutputs(EthereumTwUnspentOutputs): has_amt2 = True - async def get_data(self, *args, **kwargs): - await super().get_data(*args, **kwargs) + async def get_data(self): + await super().get_data() for e in self.data: e.amt2 = await self.twctl.get_eth_balance(e.addr) diff --git a/mmgen/tool/rpc.py b/mmgen/tool/rpc.py index a2fdf80e..62c03daa 100755 --- a/mmgen/tool/rpc.py +++ b/mmgen/tool/rpc.py @@ -64,12 +64,13 @@ class tool_cmd(tool_cmd_base): **kwargs): obj.reverse = reverse + obj.sort_key = sort or obj.sort_key obj.age_fmt = age_fmt for k, v in kwargs.items(): setattr(obj, k, v) - await obj.get_data(sort_key=sort, reverse_sort=reverse) + await obj.get_data() if interactive: await obj.view_filter_and_sort() diff --git a/mmgen/tw/view.py b/mmgen/tw/view.py index af9ae493..69ed7411 100755 --- a/mmgen/tw/view.py +++ b/mmgen/tw/view.py @@ -264,20 +264,18 @@ class TwView(MMGenObject, metaclass=AsyncInit): ret.append('Grouped') return ret - def sort_data(self, key=None, *, reverse=False): + def sort_data(self, key): if key == 'txid' and not self.txid_w: return - key = key or self.sort_key if key not in self.sort_funcs: die(1, f'{key!r}: invalid sort key. Valid options: {" ".join(self.sort_funcs)}') self.sort_key = key - assert isinstance(reverse, bool) save = self.data.copy() - self.data.sort(key=self.sort_funcs[key], reverse=reverse or self.reverse) + self.data.sort(key=self.sort_funcs[key], reverse=self.reverse) if self.data != save: self.pos = 0 - async def get_data(self, *, sort_key=None, reverse_sort=False): + async def get_data(self): rpc_data = await self.get_rpc_data()