From 5522ffb1695db54ce97451d5cac174ae0fd71bdf Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 12 Dec 2023 10:19:49 +0000 Subject: [PATCH] main.py: launch(): make params keyword-only --- cmds/mmgen-addrgen | 2 +- cmds/mmgen-addrimport | 2 +- cmds/mmgen-autosign | 2 +- cmds/mmgen-keygen | 2 +- cmds/mmgen-msg | 2 +- cmds/mmgen-passchg | 2 +- cmds/mmgen-passgen | 2 +- cmds/mmgen-regtest | 2 +- cmds/mmgen-seedjoin | 2 +- cmds/mmgen-seedsplit | 2 +- cmds/mmgen-subwalletgen | 2 +- cmds/mmgen-tool | 2 +- cmds/mmgen-txbump | 2 +- cmds/mmgen-txcreate | 2 +- cmds/mmgen-txdo | 2 +- cmds/mmgen-txsend | 2 +- cmds/mmgen-txsign | 2 +- cmds/mmgen-walletchk | 2 +- cmds/mmgen-walletconv | 2 +- cmds/mmgen-walletgen | 2 +- cmds/mmgen-xmrwallet | 2 +- mmgen/main.py | 8 +------- 22 files changed, 22 insertions(+), 28 deletions(-) diff --git a/cmds/mmgen-addrgen b/cmds/mmgen-addrgen index df5cc76b..65ce54f2 100755 --- a/cmds/mmgen-addrgen +++ b/cmds/mmgen-addrgen @@ -22,4 +22,4 @@ mmgen-addrgen: Generate a series or range of addresses from an MMGen """ from mmgen.main import launch -launch("addrgen") +launch(mod='addrgen') diff --git a/cmds/mmgen-addrimport b/cmds/mmgen-addrimport index 565eb5e5..c62d9954 100755 --- a/cmds/mmgen-addrimport +++ b/cmds/mmgen-addrimport @@ -21,4 +21,4 @@ mmgen-addrimport: Import addresses into a MMGen bitcoind watching wallet """ from mmgen.main import launch -launch("addrimport") +launch(mod='addrimport') diff --git a/cmds/mmgen-autosign b/cmds/mmgen-autosign index b5d8dcc0..c63cdd68 100755 --- a/cmds/mmgen-autosign +++ b/cmds/mmgen-autosign @@ -21,4 +21,4 @@ mmgen-autosign: Auto-sign MMGen transactions """ from mmgen.main import launch -launch("autosign") +launch(mod='autosign') diff --git a/cmds/mmgen-keygen b/cmds/mmgen-keygen index 02df3f25..035f3d69 100755 --- a/cmds/mmgen-keygen +++ b/cmds/mmgen-keygen @@ -22,4 +22,4 @@ mmgen-keygen: Generate a series or range of keys from an MMGen deterministic """ from mmgen.main import launch -launch("keygen") +launch(mod='addrgen') diff --git a/cmds/mmgen-msg b/cmds/mmgen-msg index 17946909..b7ecf921 100755 --- a/cmds/mmgen-msg +++ b/cmds/mmgen-msg @@ -13,4 +13,4 @@ mmgen-msg: Message signing operations for the MMGen suite """ from mmgen.main import launch -launch("msg") +launch(mod='msg') diff --git a/cmds/mmgen-passchg b/cmds/mmgen-passchg index e74b6872..e454bcde 100755 --- a/cmds/mmgen-passchg +++ b/cmds/mmgen-passchg @@ -22,4 +22,4 @@ mmgen-passchg: Change an MMGen deterministic wallet's passphrase, label or """ from mmgen.main import launch -launch("passchg") +launch(mod='wallet') diff --git a/cmds/mmgen-passgen b/cmds/mmgen-passgen index 79fb2cfd..b6a830cd 100755 --- a/cmds/mmgen-passgen +++ b/cmds/mmgen-passgen @@ -22,4 +22,4 @@ mmgen-passgen: Generate a range or series of passwords from an MMGen """ from mmgen.main import launch -launch("passgen") +launch(mod='passgen') diff --git a/cmds/mmgen-regtest b/cmds/mmgen-regtest index 7077f901..38905eef 100755 --- a/cmds/mmgen-regtest +++ b/cmds/mmgen-regtest @@ -22,4 +22,4 @@ mmgen-regtest: Bitcoind regression test mode setup and operations for the MMGen """ from mmgen.main import launch -launch("regtest") +launch(mod='regtest') diff --git a/cmds/mmgen-seedjoin b/cmds/mmgen-seedjoin index b91f32b9..6cca059a 100755 --- a/cmds/mmgen-seedjoin +++ b/cmds/mmgen-seedjoin @@ -21,4 +21,4 @@ mmgen-seedjoin: Recreate an MMGen deterministic wallet from its component shares """ from mmgen.main import launch -launch("seedjoin") +launch(mod='seedjoin') diff --git a/cmds/mmgen-seedsplit b/cmds/mmgen-seedsplit index 1fa5d2b7..ffa90cab 100755 --- a/cmds/mmgen-seedsplit +++ b/cmds/mmgen-seedsplit @@ -21,4 +21,4 @@ mmgen-seedsplit: Generate a seed split from an MMGen deterministic wallet """ from mmgen.main import launch -launch("seedsplit") +launch(mod='wallet') diff --git a/cmds/mmgen-subwalletgen b/cmds/mmgen-subwalletgen index bcbed010..bb05a345 100755 --- a/cmds/mmgen-subwalletgen +++ b/cmds/mmgen-subwalletgen @@ -21,4 +21,4 @@ mmgen-subwalletgen: Generate a subwallet from an MMGen deterministic wallet """ from mmgen.main import launch -launch("subwalletgen") +launch(mod='wallet') diff --git a/cmds/mmgen-tool b/cmds/mmgen-tool index 39532268..6ac81237 100755 --- a/cmds/mmgen-tool +++ b/cmds/mmgen-tool @@ -22,4 +22,4 @@ mmgen-tool: Perform various Bitcoin-related operations. """ from mmgen.main import launch -launch("tool") +launch(mod='tool') diff --git a/cmds/mmgen-txbump b/cmds/mmgen-txbump index e05f98e1..298676df 100755 --- a/cmds/mmgen-txbump +++ b/cmds/mmgen-txbump @@ -22,4 +22,4 @@ optionally sign and send it. """ from mmgen.main import launch -launch("txbump") +launch(mod='txbump') diff --git a/cmds/mmgen-txcreate b/cmds/mmgen-txcreate index 6715592d..8614eb6e 100755 --- a/cmds/mmgen-txcreate +++ b/cmds/mmgen-txcreate @@ -22,4 +22,4 @@ mmgen-txcreate: Create a Bitcoin transaction from MMGen- or non-MMGen inputs """ from mmgen.main import launch -launch("txcreate") +launch(mod='txcreate') diff --git a/cmds/mmgen-txdo b/cmds/mmgen-txdo index a7e1b72e..6d7883e7 100755 --- a/cmds/mmgen-txdo +++ b/cmds/mmgen-txdo @@ -21,4 +21,4 @@ mmgen-txdo: Create, sign and broadcast an online MMGen transaction """ from mmgen.main import launch -launch("txdo") +launch(mod='txdo') diff --git a/cmds/mmgen-txsend b/cmds/mmgen-txsend index e0b12b9a..de105b2d 100755 --- a/cmds/mmgen-txsend +++ b/cmds/mmgen-txsend @@ -21,4 +21,4 @@ mmgen-txsend: Broadcast a transaction signed by 'mmgen-txsign' to the network """ from mmgen.main import launch -launch("txsend") +launch(mod='txsend') diff --git a/cmds/mmgen-txsign b/cmds/mmgen-txsign index fa22b969..2d70ffb1 100755 --- a/cmds/mmgen-txsign +++ b/cmds/mmgen-txsign @@ -21,4 +21,4 @@ mmgen-txsign: Sign a transaction generated by 'mmgen-txcreate' """ from mmgen.main import launch -launch("txsign") +launch(mod='txsign') diff --git a/cmds/mmgen-walletchk b/cmds/mmgen-walletchk index 265ee0be..fc634d77 100755 --- a/cmds/mmgen-walletchk +++ b/cmds/mmgen-walletchk @@ -21,4 +21,4 @@ mmgen-walletchk: Check integrity of an MMGen deterministic wallet """ from mmgen.main import launch -launch("walletchk") +launch(mod='wallet') diff --git a/cmds/mmgen-walletconv b/cmds/mmgen-walletconv index f75f4080..aaa87b51 100755 --- a/cmds/mmgen-walletconv +++ b/cmds/mmgen-walletconv @@ -22,4 +22,4 @@ mmgen-walletconv: Convert an MMGen deterministic wallet from one format """ from mmgen.main import launch -launch("walletconv") +launch(mod='wallet') diff --git a/cmds/mmgen-walletgen b/cmds/mmgen-walletgen index c0c0f1bb..b731f452 100755 --- a/cmds/mmgen-walletgen +++ b/cmds/mmgen-walletgen @@ -21,4 +21,4 @@ mmgen-walletgen: Generate an MMGen deterministic wallet """ from mmgen.main import launch -launch("walletgen") +launch(mod='wallet') diff --git a/cmds/mmgen-xmrwallet b/cmds/mmgen-xmrwallet index 8a761b6e..fa1c8d38 100755 --- a/cmds/mmgen-xmrwallet +++ b/cmds/mmgen-xmrwallet @@ -21,4 +21,4 @@ mmgen-xmrwallet: Monero wallet ops for the MMGen suite """ from mmgen.main import launch -launch("xmrwallet") +launch(mod='xmrwallet') diff --git a/mmgen/main.py b/mmgen/main.py index ec87a55b..5807f605 100755 --- a/mmgen/main.py +++ b/mmgen/main.py @@ -22,13 +22,7 @@ main: Script launcher for the MMGen Project import sys,os -def launch(mod,package='mmgen'): - - if mod in ('walletgen','walletchk','walletconv','passchg','subwalletgen','seedsplit'): - mod = 'wallet' - - if mod == 'keygen': - mod = 'addrgen' +def launch(*, mod=None, package='mmgen'): if sys.platform == 'linux' and sys.stdin.isatty(): import termios,atexit