proto.xmr.daemon: variable renames

mmgen/proto/xmr/daemon.py

@@ -97,11 +97,11 @@ class MoneroWalletDaemon(RPCDaemon):
 			test_suite  = False,
 			user        = None,
 			passwd      = None,
-			daemon_addr = None,
+			monerod_addr = None,
 			proxy       = None,
 			port_shift  = None,
 			datadir     = None,
-			trust_daemon = False ):
+			trust_monerod = False ):
 
 		self.proto = proto
 		self.test_suite = test_suite
@@ -120,9 +120,9 @@ class MoneroWalletDaemon(RPCDaemon):
 		self.logfile = os.path.join(self.datadir,id_str+'.log')
 
 		self.proxy = proxy
-		self.daemon_addr = daemon_addr
-		self.daemon_port = (
-			None if daemon_addr else
+		self.monerod_addr = monerod_addr
+		self.monerod_port = (
+			None if monerod_addr else
 			CoinDaemon(
 				cfg        = self.cfg,
 				proto      = proto,
@@ -141,14 +141,14 @@ class MoneroWalletDaemon(RPCDaemon):
 				"the MMGen config file." )
 
 		self.daemon_args = list_gen(
-			['--trusted-daemon', trust_daemon],
-			['--untrusted-daemon', not trust_daemon],
+			['--trusted-daemon', trust_monerod],
+			['--untrusted-daemon', not trust_monerod],
 			[f'--rpc-bind-port={self.rpc_port}'],
 			[f'--wallet-dir={self.wallet_dir}'],
 			[f'--log-file={self.logfile}'],
 			[f'--rpc-login={self.user}:{self.passwd}'],
-			[f'--daemon-address={self.daemon_addr}', self.daemon_addr],
-			[f'--daemon-port={self.daemon_port}',    not self.daemon_addr],
+			[f'--daemon-address={self.monerod_addr}', self.monerod_addr],
+			[f'--daemon-port={self.monerod_port}',    not self.monerod_addr],
 			[f'--proxy={self.proxy}',                self.proxy],
 			[f'--pidfile={self.pidfile}',            self.platform == 'linux'],
 			['--detach',                             not (self.opt.no_daemonize or self.platform=='win')],

mmgen/xmrwallet.py

@@ -638,7 +638,7 @@ class MoneroWalletOps:
 	class base(MMGenObject):
 
 		opts = ('wallet_dir',)
-		trust_daemon = False
+		trust_monerod = False
 		do_umount = True
 
 		def __init__(self,cfg,uarg_tuple):
@@ -796,8 +796,8 @@ class MoneroWalletOps:
 				proto       = self.proto,
 				wallet_dir  = self.cfg.wallet_dir or '.',
 				test_suite  = self.cfg.test_suite,
-				daemon_addr = relay_opt[1] if relay_opt else (self.cfg.daemon or None),
-				trust_daemon = self.trust_daemon,
+				monerod_addr = relay_opt[1] if relay_opt else (self.cfg.daemon or None),
+				trust_monerod = self.trust_monerod,
 			)
 
 			u = self.wd.usr_daemon_args = []
@@ -824,7 +824,7 @@ class MoneroWalletOps:
 
 		def get_coin_daemon_rpc(self):
 
-			host,port = self.cfg.daemon.split(':') if self.cfg.daemon else ('localhost',self.wd.daemon_port)
+			host,port = self.cfg.daemon.split(':') if self.cfg.daemon else ('localhost',self.wd.monerod_port)
 
 			from .daemon import CoinDaemon
 			return MoneroRPCClient(
@@ -1444,7 +1444,7 @@ class MoneroWalletOps:
 				proto       = self.proto,
 				wallet_dir  = self.cfg.wallet_dir or '.',
 				test_suite  = self.cfg.test_suite,
-				daemon_addr = m[1],
+				monerod_addr = m[1],
 				proxy       = m[2] )
 
 			if self.cfg.test_suite:
@@ -1771,7 +1771,7 @@ class MoneroWalletOps:
 	class import_key_images(wallet):
 		action = 'importing key images into'
 		stem = 'process'
-		trust_daemon = True
+		trust_monerod = True
 
 		async def process_wallet(self,d,fn,last):
 			h = self.rpc(self,d)

test/test_py_d/ts_xmrwallet.py

@@ -259,7 +259,7 @@ class TestSuiteXMRWallet(TestSuiteBase):
 				passwd     = 'bar',
 				port_shift = shift,
 				datadir    = os.path.join('test','daemons'),
-				daemon_addr = f'127.0.0.1:{md.rpc_port}',
+				monerod_addr = f'127.0.0.1:{md.rpc_port}',
 			)
 			wd_rpc = MoneroWalletRPCClient(
 				cfg             = cfg,