disable rpc.stop_daemon()

test/cmdtest_d/ct_xmrwallet.py

@@ -48,10 +48,7 @@ from .ct_base import CmdTestBase
 # atexit functions:
 def stop_daemons(self):
 	for v in self.users.values():
-		if sys.platform == 'darwin' or '--restricted-rpc' in v.md.start_cmd:
-			v.md.stop()
-		else:
-			async_run(v.md_rpc.stop_daemon())
+		v.md.stop()
 
 def stop_miner_wallet_daemon(self):
 	async_run(self.users['miner'].wd_rpc.stop_daemon())

test/daemontest_d/ut_rpc.py

@@ -244,10 +244,7 @@ class unit_tests:
 				await c.stop_daemon()
 
 				if not cfg.no_daemon_stop:
-					if sys.platform == 'darwin':
-						md.stop()
-					else:
-						await md.rpc.stop_daemon()
+					md.stop()
 
 			gmsg('OK')
 

test/include/coin_daemon_control.py

@@ -118,13 +118,10 @@ def run(network_id=None, proto=None, daemon_id=None, missing_exec_ok=False):
 		for cmd in d.start_cmds if action == 'start' else [d.stop_cmd]:
 			print(' '.join(cmd))
 	else:
-		if action == 'stop' and hasattr(d, 'rpc'):
-			async_run(d.rpc.stop_daemon(quiet=cfg.quiet))
-		else:
-			d.cmd(action, quiet=cfg.quiet)
-			if action == 'stop' and cfg.remove_datadir:
-				cfg._util.vmsg(f'Removing ‘{d.datadir}’')
-				d.remove_datadir()
+		d.cmd(action, quiet=cfg.quiet)
+		if action == 'stop' and cfg.remove_datadir:
+			cfg._util.vmsg(f'Removing ‘{d.datadir}’')
+			d.remove_datadir()
 
 def main():