Browse Source

tw.view: get_data(), sort_data(): remove keyword params

The MMGen Project 1 week ago
parent
commit
112f2cd539
3 changed files with 7 additions and 8 deletions
  1. 2 2
      mmgen/proto/eth/tw/unspent.py
  2. 2 1
      mmgen/tool/rpc.py
  3. 3 5
      mmgen/tw/view.py

+ 2 - 2
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)

+ 2 - 1
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()

+ 3 - 5
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()