Browse Source

util.py: reimplement `async_run()` (stub)

The MMGen Project 2 months ago
parent
commit
eb7bcef036

+ 1 - 1
examples/halving-calculator.py

@@ -87,4 +87,4 @@ async def main():
 		f'Est. time until halving: {dhms(cur["time"] + t_rem - clock_time)}\n'
 		f'Est. time until halving: {dhms(cur["time"] + t_rem - clock_time)}\n'
 	)
 	)
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_addrimport.py

@@ -178,4 +178,4 @@ cfg = Config(opts_data=opts_data, need_amt=False)
 
 
 proto = cfg._proto
 proto = cfg._proto
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_autosign.py

@@ -187,7 +187,7 @@ def main(do_loop):
 			ret = await asi.do_sign()
 			ret = await asi.do_sign()
 			asi.at_exit(not ret)
 			asi.at_exit(not ret)
 
 
-	async_run(do())
+	async_run(cfg, do)
 
 
 from .cfg import Config
 from .cfg import Config
 from .autosign import Autosign
 from .autosign import Autosign

+ 1 - 1
mmgen/main_msg.py

@@ -227,4 +227,4 @@ async def main():
 		case _:
 		case _:
 			die(1, f'{op!r}: unrecognized operation')
 			die(1, f'{op!r}: unrecognized operation')
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_regtest.py

@@ -86,4 +86,4 @@ elif cmd_args[0] not in ('cli', 'wallet_cli', 'balances'):
 async def main():
 async def main():
 	await MMGenRegtest(cfg, cfg.coin, bdb_wallet=cfg.bdb_wallet).cmd(cmd_args)
 	await MMGenRegtest(cfg, cfg.coin, bdb_wallet=cfg.bdb_wallet).cmd(cmd_args)
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_tool.py

@@ -392,7 +392,7 @@ if gc.prog_name.endswith('-tool'):
 	args, kwargs = process_args(cmd, args, cls)
 	args, kwargs = process_args(cmd, args, cls)
 
 
 	func = getattr(cls(cfg, cmdname=cmd), cmd)
 	func = getattr(cls(cfg, cmdname=cmd), cmd)
-	ret = async_run(func(*args, **kwargs)) if isAsync(func) else func(*args, **kwargs)
+	ret = async_run(cfg, func, args=args, kwargs=kwargs) if isAsync(func) else func(*args, **kwargs)
 
 
 	process_result(
 	process_result(
 		ret,
 		ret,

+ 1 - 1
mmgen/main_txbump.py

@@ -217,4 +217,4 @@ async def main():
 			ask_write_default_yes = False,
 			ask_write_default_yes = False,
 			ask_overwrite         = not cfg.yes)
 			ask_overwrite         = not cfg.yes)
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_txcreate.py

@@ -155,4 +155,4 @@ async def main():
 		ask_overwrite         = not cfg.yes,
 		ask_overwrite         = not cfg.yes,
 		ask_write_default_yes = False)
 		ask_write_default_yes = False)
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_txdo.py

@@ -196,4 +196,4 @@ async def main():
 	else:
 	else:
 		die(2, 'Transaction could not be signed')
 		die(2, 'Transaction could not be signed')
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_txsend.py

@@ -158,4 +158,4 @@ async def main():
 
 
 	await tx.send(cfg, asi)
 	await tx.send(cfg, asi)
 
 
-async_run(main())
+async_run(cfg, main)

+ 1 - 1
mmgen/main_txsign.py

@@ -158,4 +158,4 @@ async def main():
 	if bad_tx_count:
 	if bad_tx_count:
 		die(2, f'{bad_tx_count} transaction{suf(bad_tx_count)} could not be signed')
 		die(2, f'{bad_tx_count} transaction{suf(bad_tx_count)} could not be signed')
 
 
-async_run(main())
+async_run(cfg, main)

+ 2 - 2
mmgen/util.py

@@ -441,9 +441,9 @@ def get_subclasses(cls, *, names=False):
 			yield from gen(i)
 			yield from gen(i)
 	return tuple((c.__name__ for c in gen(cls)) if names else gen(cls))
 	return tuple((c.__name__ for c in gen(cls)) if names else gen(cls))
 
 
-def async_run(coro):
+def async_run(cfg, func, *, args=(), kwargs={}):
 	import asyncio
 	import asyncio
-	return asyncio.run(coro)
+	return asyncio.run(func(*args, **kwargs))
 
 
 def wrap_ripemd160(called=[]):
 def wrap_ripemd160(called=[]):
 	if not called:
 	if not called: