From c373ed7a2db983442b8b9f20b19a7754e05c280c Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Sat, 1 Jul 2023 16:47:49 +0000
Subject: [PATCH] rpc_init(): skip wallet initialization

---
 mmgen_node_tools/data/version               | 2 +-
 mmgen_node_tools/main_addrbal.py            | 2 +-
 mmgen_node_tools/main_blocks_info.py        | 2 +-
 mmgen_node_tools/main_feeview.py            | 2 +-
 mmgen_node_tools/main_halving_calculator.py | 2 +-
 mmgen_node_tools/main_netrate.py            | 2 +-
 mmgen_node_tools/main_peerblocks.py         | 2 +-
 mmgen_node_tools/main_txfind.py             | 2 +-
 test/test_py_d/ts_regtest.py                | 5 +++--
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mmgen_node_tools/data/version b/mmgen_node_tools/data/version
index 623245b..b473ce1 100644
--- a/mmgen_node_tools/data/version
+++ b/mmgen_node_tools/data/version
@@ -1 +1 @@
-3.1.dev17
+3.2.dev0
diff --git a/mmgen_node_tools/main_addrbal.py b/mmgen_node_tools/main_addrbal.py
index 177bac4..a461e9e 100755
--- a/mmgen_node_tools/main_addrbal.py
+++ b/mmgen_node_tools/main_addrbal.py
@@ -118,7 +118,7 @@ async def main(req_addrs):
 	addrs = [CoinAddr(proto,addr) for addr in req_addrs]
 
 	from mmgen.rpc import rpc_init
-	rpc = await rpc_init(cfg)
+	rpc = await rpc_init(cfg,ignore_wallet=True)
 
 	height = await rpc.call('getblockcount')
 	Msg(f'{proto.coin} {proto.network.upper()} [height {height}]')
diff --git a/mmgen_node_tools/main_blocks_info.py b/mmgen_node_tools/main_blocks_info.py
index 1fe5e82..c2bbf59 100755
--- a/mmgen_node_tools/main_blocks_info.py
+++ b/mmgen_node_tools/main_blocks_info.py
@@ -164,7 +164,7 @@ async def main():
 
 	cls = JSONBlocksInfo if cfg.json else BlocksInfo
 
-	m = cls( cfg, cfg._args, await rpc_init(cfg) )
+	m = cls( cfg, cfg._args, await rpc_init(cfg,ignore_wallet=True) )
 
 	if m.fnames and not cfg.no_header:
 		m.print_header()
diff --git a/mmgen_node_tools/main_feeview.py b/mmgen_node_tools/main_feeview.py
index 527dc85..72692fc 100755
--- a/mmgen_node_tools/main_feeview.py
+++ b/mmgen_node_tools/main_feeview.py
@@ -205,7 +205,7 @@ async def main():
 	proto = cfg._proto
 
 	from mmgen.rpc import rpc_init
-	c = await rpc_init(cfg)
+	c = await rpc_init(cfg,ignore_wallet=True)
 
 	mempool = await c.call('getrawmempool',True)
 
diff --git a/mmgen_node_tools/main_halving_calculator.py b/mmgen_node_tools/main_halving_calculator.py
index 1e35b2a..1648d76 100755
--- a/mmgen_node_tools/main_halving_calculator.py
+++ b/mmgen_node_tools/main_halving_calculator.py
@@ -68,7 +68,7 @@ async def main():
 	proto = cfg._proto
 
 	from mmgen.rpc import rpc_init
-	c = await rpc_init( cfg, proto )
+	c = await rpc_init( cfg, proto, ignore_wallet=True )
 
 	tip = await c.call('getblockcount')
 	assert tip > 1, 'block tip must be > 1'
diff --git a/mmgen_node_tools/main_netrate.py b/mmgen_node_tools/main_netrate.py
index da0b4dc..f1661c5 100755
--- a/mmgen_node_tools/main_netrate.py
+++ b/mmgen_node_tools/main_netrate.py
@@ -43,7 +43,7 @@ ERASE_LINE,CUR_UP = '\033[K','\033[1A'
 async def main():
 
 	from mmgen.rpc import rpc_init
-	c = await rpc_init(cfg)
+	c = await rpc_init(cfg,ignore_wallet=True)
 
 	async def get_data():
 		d = await c.call('getnettotals')
diff --git a/mmgen_node_tools/main_peerblocks.py b/mmgen_node_tools/main_peerblocks.py
index 56b412c..6ebb5a3 100755
--- a/mmgen_node_tools/main_peerblocks.py
+++ b/mmgen_node_tools/main_peerblocks.py
@@ -37,7 +37,7 @@ async def main():
 	cfg = Config(opts_data=opts_data)
 
 	from mmgen.rpc import rpc_init
-	rpc = await rpc_init(cfg)
+	rpc = await rpc_init(cfg,ignore_wallet=True)
 
 	from .PeerBlocks import BlocksDisplay,PeersDisplay
 	blocks = BlocksDisplay(cfg)
diff --git a/mmgen_node_tools/main_txfind.py b/mmgen_node_tools/main_txfind.py
index cabed6f..cc8df14 100755
--- a/mmgen_node_tools/main_txfind.py
+++ b/mmgen_node_tools/main_txfind.py
@@ -63,7 +63,7 @@ async def main(txid):
 		msg(f'TxID: {txid}')
 
 	from mmgen.rpc import rpc_init
-	c = await rpc_init(cfg)
+	c = await rpc_init(cfg,ignore_wallet=True)
 
 	exitval = 0
 	try:
diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py
index 9b72cb2..f8859b8 100755
--- a/test/test_py_d/ts_regtest.py
+++ b/test/test_py_d/ts_regtest.py
@@ -132,8 +132,9 @@ class TestSuiteRegtest(TestSuiteBase):
 		return self.netrate( ['--help'], 'USAGE:.*' )
 
 	def netrate2(self):
-		t = self.netrate( [], 'sent:.*' )
-		t.kill(2)
+		t = self.netrate( [], r'sent:.*' )
+		t.kill(15)
+		t.req_exit_val = -15
 		return t
 
 	def halving_calculator(self,add_args,expect_list):