From 66c0ca0576d7b42841a9c372af19dd19d5ba55f0 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 1 Dec 2022 12:32:32 +0000 Subject: [PATCH] mmgen-tool twimport: use aiohttp backend by default --- mmgen/main_tool.py | 12 +++++++++--- test/test_py_d/ts_regtest.py | 12 ++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/mmgen/main_tool.py b/mmgen/main_tool.py index 058364ae..800c6d8b 100755 --- a/mmgen/main_tool.py +++ b/mmgen/main_tool.py @@ -364,12 +364,18 @@ if g.prog_name == 'mmgen-tool' and not opt._lock: if len(po.cmd_args) < 1: opts.usage() - cls = get_cmd_cls(po.cmd_args[0]) + cmd = po.cmd_args[0] + + cls = get_cmd_cls(cmd) if not cls: - die(1,f'{po.cmd_args[0]!r}: no such command') + die(1,f'{cmd!r}: no such command') - cmd,*args = opts.init( opts_data, parsed_opts=po, need_proto=cls.need_proto ) + cmd,*args = opts.init( + opts_data, + parsed_opts = po, + need_proto = cls.need_proto, + init_opts = {'rpc_backend':'aiohttp'} if cmd == 'twimport' else None ) if cmd in ('help','usage') and args: args[0] = 'command_name=' + args[0] diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py index b015262e..add30711 100755 --- a/test/test_py_d/ts_regtest.py +++ b/test/test_py_d/ts_regtest.py @@ -1104,10 +1104,14 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): self.write_to_tmpfile( fn, json.dumps(text,indent=4) ) return 'ok' - def carol_twimport(self,add_args=[],add_parms=[],expect_str=None,expect_str2='Found 1 unspent output'): + def carol_twimport(self,rpc_backend='http',add_parms=[],expect_str=None,expect_str2='Found 1 unspent output'): from mmgen.tw.json import TwJSON fn = joinpath( self.tmpdir, TwJSON.Base(self.proto).dump_fn ) - t = self.spawn('mmgen-tool', add_args + ['--carol','twimport',fn] + add_parms) + t = self.spawn( + 'mmgen-tool', + ([f'--rpc-backend={rpc_backend}'] if rpc_backend else []) + + ['--carol','twimport',fn] + + add_parms ) t.expect('(y/N): ','y') if expect_str: t.expect(expect_str) @@ -1119,7 +1123,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): return t def carol_twimport_nochksum(self): - return self.carol_twimport(add_args=['--rpc-backend=aio'],add_parms=['ignore_checksum=true']) + return self.carol_twimport(rpc_backend=None,add_parms=['ignore_checksum=true']) def carol_twimport_batch(self): return self.carol_twimport(add_parms=['batch=true']) @@ -1528,7 +1532,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): def carol_twimport2(self): u,b = (4,3) if self.proto.cap('segwit') else (3,2) return self.carol_twimport( - add_args = ['--rpc-backend=aio'], + rpc_backend = None, add_parms = ['ignore_checksum=true'], expect_str2 = f'Found {u} unspent outputs in {b} blocks' )