From 82a5798deb6eb321764ddb9a1ad1cf7e8cc97214 Mon Sep 17 00:00:00 2001 From: DeKaiju Date: Tue, 14 Apr 2020 11:00:44 +0800 Subject: [PATCH] refactor(btmsender): code refactoring --- README.md | 4 ++-- btmsender/README.md | 2 +- spanner.py | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 46905fa..c5e7195 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,14 @@ Tool send BTM to large numbers of address Usage: ``` - spanner.py btmsender [-h] -i I -a A -p P [-c C] + spanner.py btmsender [-h] -n N -i I -a A [-c C] [-u] [-t T] ``` Options: ``` -h, --help show this help message and exit + -n node bytomd or vapord node address -i input transaction txt file -a account wallet account id - -p password wallet account password -c count transaction output count -u use unconfirmed UTXO build transaction -t time_range the transaction will not be submitted into block after this height diff --git a/btmsender/README.md b/btmsender/README.md index ec3ee60..d3012d6 100644 --- a/btmsender/README.md +++ b/btmsender/README.md @@ -7,9 +7,9 @@ Usage: Options: ``` -h, --help show this help message and exit + -n node bytomd or vapord node address -i input transaction txt file -a account wallet account id - -p password wallet account password -c count transaction output count -u use unconfirmed UTXO build transaction -t time_range the transaction will not be submitted into block after this height diff --git a/spanner.py b/spanner.py index d2a148d..0824c9a 100755 --- a/spanner.py +++ b/spanner.py @@ -5,14 +5,14 @@ from btmsender import btmsender from utxomerger import merge_utxo if __name__ == "__main__": - if sys.argv[1] == 'btmsender': - sys.argv.pop(1) - sys.exit(btmsender.sender()) - elif sys.argv[1] == 'utxomerger': - sys.argv.pop(1) - sys.exit(merge_utxo.main()) - else: - print("Input error:\n" - "btmsender usage: spanner.py btmsender [-h] -i INPUT_FILE -a ACCOUNT_ID -p PASSWORD [-c OUTPUT_COUNT]\n" - "utxomerger usage: spanner.py utxomerger [-h] [-o URL] [-a ACCOUNT_ALIAS] [-p PASSWORD] [-x MAX_AMOUNT] [-s MIN_AMOUNT] [-l] [-m MERGE_LIST] [-y]") - sys.exit(1) + if len(sys.argv) >= 2: + if sys.argv[1] == 'btmsender': + sys.argv.pop(1) + sys.exit(btmsender.sender()) + elif sys.argv[1] == 'utxomerger': + sys.argv.pop(1) + sys.exit(merge_utxo.main()) + print("Input error:\n" + "btmsender usage: spanner.py btmsender [-h] -n NODE_ADDRESS -i INPUT_FILE -a ACCOUNT_ID -p PASSWORD [-c OUTPUT_COUNT]\n" + "utxomerger usage: spanner.py utxomerger [-h] [-o URL] [-a ACCOUNT_ALIAS] [-p PASSWORD] [-x MAX_AMOUNT] [-s MIN_AMOUNT] [-l] [-m MERGE_LIST] [-y]") + sys.exit(1) -- 2.11.0