Browse Source

xmrwallet: pass `compat_call` in uargs tuple

The MMGen Project 6 days ago
parent
commit
f9e1cf479b
3 changed files with 5 additions and 5 deletions
  1. 1 1
      mmgen/data/version
  2. 3 4
      mmgen/xmrwallet/__init__.py
  3. 1 0
      mmgen/xmrwallet/ops/__init__.py

+ 1 - 1
mmgen/data/version

@@ -1 +1 @@
-16.1.dev17
+16.1.dev18

+ 3 - 4
mmgen/xmrwallet/__init__.py

@@ -28,7 +28,8 @@ tx_priorities = {
 uargs = namedtuple('xmrwallet_uargs', [
 uargs = namedtuple('xmrwallet_uargs', [
 	'infile',
 	'infile',
 	'wallets',
 	'wallets',
-	'spec'])
+	'spec',
+	'compat_call'])
 
 
 uarg_info = (
 uarg_info = (
 	lambda e, hp: {
 	lambda e, hp: {
@@ -127,6 +128,4 @@ def op(op, cfg, infile, wallets, *, spec=None, compat_call=False):
 			'daemon': cfg.daemon or cfg.monero_daemon,
 			'daemon': cfg.daemon or cfg.monero_daemon,
 			'watch_only': cfg.watch_only or cfg.autosign or bool(cfg.autosign_mountpoint),
 			'watch_only': cfg.watch_only or cfg.autosign or bool(cfg.autosign_mountpoint),
 			'wallet_dir': twctl_cls.get_tw_dir(cfg, cfg._proto)})
 			'wallet_dir': twctl_cls.get_tw_dir(cfg, cfg._proto)})
-	ret = op_cls(op)(cfg, uargs(infile, wallets, spec))
-	ret.compat_call = compat_call
-	return ret
+	return op_cls(op)(cfg, uargs(infile, wallets, spec, compat_call))

+ 1 - 0
mmgen/xmrwallet/ops/__init__.py

@@ -42,6 +42,7 @@ class OpBase:
 
 
 		self.cfg = cfg
 		self.cfg = cfg
 		self.uargs = uarg_tuple
 		self.uargs = uarg_tuple
+		self.compat_call = self.uargs.compat_call
 
 
 		classes = tuple(gen_classes())
 		classes = tuple(gen_classes())
 		self.opts = tuple(set(opt for cls in classes for opt in xmrwallet.opts))
 		self.opts = tuple(set(opt for cls in classes for opt in xmrwallet.opts))