Browse Source

xmrwallet.ops.label:main(): remove `auto` param

The MMGen Project 1 week ago
parent
commit
c7f240bb5b
2 changed files with 4 additions and 4 deletions
  1. 1 1
      mmgen/proto/xmr/tw/ctl.py
  2. 3 3
      mmgen/xmrwallet/ops/label.py

+ 1 - 1
mmgen/proto/xmr/tw/ctl.py

@@ -42,4 +42,4 @@ class MoneroTwCtl(TwCtlWithStore):
 			spec = f'{m.idx}:{m.acct_idx}:{m.addr_idx},{comment}',
 			spec = f'{m.idx}:{m.acct_idx}:{m.addr_idx},{comment}',
 			compat_call = True)
 			compat_call = True)
 		await op.restart_wallet_daemon()
 		await op.restart_wallet_daemon()
-		return await op.main(add_timestr=add_timestr, auto=True)
+		return await op.main(add_timestr=add_timestr)

+ 3 - 3
mmgen/xmrwallet/ops/label.py

@@ -29,7 +29,7 @@ class OpLabel(OpMixinSpec, OpWallet):
 	opts     = ()
 	opts     = ()
 	wallet_offline = True
 	wallet_offline = True
 
 
-	async def main(self, add_timestr='ask', auto=False):
+	async def main(self, add_timestr='ask'):
 
 
 		if not self.compat_call:
 		if not self.compat_call:
 			gmsg('\n{a} label for wallet {b}, account #{c}, address #{d}'.format(
 			gmsg('\n{a} label for wallet {b}, account #{c}, address #{d}'.format(
@@ -61,7 +61,7 @@ class OpLabel(OpMixinSpec, OpWallet):
 			(self.label + (f' [{make_timestr()}]' if add_timestr else '')) if self.label
 			(self.label + (f' [{make_timestr()}]' if add_timestr else '')) if self.label
 			else '')
 			else '')
 
 
-		if not auto:
+		if not self.compat_call:
 			ca = CoinAddr(self.proto, addr['address'])
 			ca = CoinAddr(self.proto, addr['address'])
 			from . import addr_width
 			from . import addr_width
 			msg('\n  {a} {b}\n  {c} {d}\n  {e} {f}'.format(
 			msg('\n  {a} {b}\n  {c} {d}\n  {e} {f}'.format(
@@ -76,7 +76,7 @@ class OpLabel(OpMixinSpec, OpWallet):
 
 
 		if addr['label'] == new_label:
 		if addr['label'] == new_label:
 			ymsg('\nLabel is unchanged, operation cancelled')
 			ymsg('\nLabel is unchanged, operation cancelled')
-		elif auto or keypress_confirm(self.cfg, f'  {op.capitalize()} label?'):
+		elif self.compat_call or keypress_confirm(self.cfg, f'  {op.capitalize()} label?'):
 			h.set_label(self.account, self.address_idx, new_label)
 			h.set_label(self.account, self.address_idx, new_label)
 			ret = h.print_acct_addrs(h.get_wallet_data(print=False), self.account)
 			ret = h.print_acct_addrs(h.get_wallet_data(print=False), self.account)
 			label_chk = ret[self.address_idx]['label']
 			label_chk = ret[self.address_idx]['label']