mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

mmgen-tool twimport: use aiohttp backend by default

Browse source
This commit is contained in:
The MMGen Project 2022-12-01 12:32:32 +00:00
commit 66c0ca0576
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mmgen/main_tool.py
View file

@ -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]

12
test/test_py_d/ts_regtest.py
View file

@ -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' )