From 641c6bdf97810df7118c23ff4e66d34c1c6a4958 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Sun, 10 Oct 2021 20:18:15 +0000
Subject: [PATCH] MoneroWalletRPCClient: simplify instantiation

---
 mmgen/rpc.py                   | 13 +++++++++++++
 mmgen/xmrwallet.py             | 14 ++------------
 test/test_py_d/ts_xmrwallet.py |  8 +-------
 test/unit_tests_d/ut_rpc.py    |  6 +-----
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/mmgen/rpc.py b/mmgen/rpc.py
index 639e882c..3c675b7f 100755
--- a/mmgen/rpc.py
+++ b/mmgen/rpc.py
@@ -706,6 +706,19 @@ class MoneroRPCClientRaw(MoneroRPCClient):
 class MoneroWalletRPCClient(MoneroRPCClient):
 
 	auth_type = 'digest'
+
+	def __init__(self,daemon,test_connection=True):
+
+		RPCClient.__init__(
+			self,
+			daemon.host,
+			daemon.rpc_port,
+			test_connection = test_connection )
+
+		self.daemon = daemon
+		self.auth = auth_data(daemon.user,daemon.passwd)
+		self.set_backend('requests')
+
 	rpcmethods = (
 		'get_version',
 		'get_height',    # sync height of the open wallet
diff --git a/mmgen/xmrwallet.py b/mmgen/xmrwallet.py
index 99e96408..a1c323e0 100755
--- a/mmgen/xmrwallet.py
+++ b/mmgen/xmrwallet.py
@@ -341,12 +341,7 @@ class MoneroWalletOps:
 			if not uopt.no_start_wallet_daemon:
 				self.wd.restart()
 
-			self.c = MoneroWalletRPCClient(
-				host   = self.wd.host,
-				port   = self.wd.rpc_port,
-				user   = self.wd.user,
-				passwd = self.wd.passwd
-			)
+			self.c = MoneroWalletRPCClient(daemon=self.wd)
 
 		def create_addr_data(self):
 			if uarg.wallets:
@@ -742,12 +737,7 @@ class MoneroWalletOps:
 
 			self.wd2.start()
 
-			self.c = MoneroWalletRPCClient(
-				host   = self.wd2.host,
-				port   = self.wd2.rpc_port,
-				user   = self.wd2.user,
-				passwd = self.wd2.passwd
-			)
+			self.c = MoneroWalletRPCClient(daemon=self.wd2)
 
 		async def main(self):
 			gmsg(f'\n{self.desc}ing account #{self.account} of wallet {self.source.idx}' + (
diff --git a/test/test_py_d/ts_xmrwallet.py b/test/test_py_d/ts_xmrwallet.py
index 78438533..f39edb8c 100755
--- a/test/test_py_d/ts_xmrwallet.py
+++ b/test/test_py_d/ts_xmrwallet.py
@@ -236,13 +236,7 @@ class TestSuiteXMRWallet(TestSuiteBase):
 				datadir    = os.path.join('test','daemons'),
 				daemon_addr = f'127.0.0.1:{md.rpc_port}',
 			)
-			wd_rpc = MoneroWalletRPCClient(
-				host   = wd.host,
-				port   = wd.rpc_port,
-				user   = wd.user,
-				passwd = wd.passwd,
-				test_connection = False,
-			)
+			wd_rpc = MoneroWalletRPCClient( daemon=wd, test_connection=False )
 			self.users[user] = ud(
 				sid           = sid,
 				mmwords       = f'test/ref/{sid}.mmwords',
diff --git a/test/unit_tests_d/ut_rpc.py b/test/unit_tests_d/ut_rpc.py
index 1aee3ca2..058e53da 100755
--- a/test/unit_tests_d/ut_rpc.py
+++ b/test/unit_tests_d/ut_rpc.py
@@ -124,11 +124,7 @@ class unit_tests:
 				if not opt.no_daemon_autostart:
 					md.start()
 				wd.start()
-				c = MoneroWalletRPCClient(
-					host   = wd.host,
-					port   = wd.rpc_port,
-					user   = wd.user,
-					passwd = wd.passwd )
+				c = MoneroWalletRPCClient(daemon=wd)
 				await c.call('get_version')
 
 			for md,wd in daemons: