diff --git a/silkaj/cli.py b/silkaj/cli.py index dc8e563e19e458a8bc91a4e7744b39d9a6ee8215..17988c3a3595176928a3cabd0c1229f67eb572eb 100644 --- a/silkaj/cli.py +++ b/silkaj/cli.py @@ -31,14 +31,14 @@ from silkaj.constants import ( SILKAJ_VERSION, ) from silkaj.g1_monetary_license import license_command -from silkaj.money.balance import cmd_amount +from silkaj.money.balance import balance_cmd from silkaj.money.history import transaction_history -from silkaj.money.transfer import send_transaction +from silkaj.money.transfer import transfer_money from silkaj.wot import revocation from silkaj.wot.certification import send_certification -from silkaj.wot.lookup import id_pubkey_correspondence +from silkaj.wot.lookup import lookup_cmd from silkaj.wot.membership import send_membership -from silkaj.wot.wot import received_sent_certifications +from silkaj.wot.wot import status @group() @@ -149,9 +149,9 @@ def money_group() -> None: pass -money_group.add_command(cmd_amount) +money_group.add_command(balance_cmd) money_group.add_command(transaction_history) -money_group.add_command(send_transaction) +money_group.add_command(transfer_money) @cli.group("wot", help="Web-of-Trust related commands") @@ -161,9 +161,9 @@ def wot_group() -> None: wot_group.add_command(send_certification) -wot_group.add_command(id_pubkey_correspondence) +wot_group.add_command(lookup_cmd) wot_group.add_command(send_membership) -wot_group.add_command(received_sent_certifications) +wot_group.add_command(status) @wot_group.group( diff --git a/silkaj/money/balance.py b/silkaj/money/balance.py index 9483cb759235b189a26ca4c806ccac668a01042e..61c02fce9fa5e83b15c7c2a04da5d9b10f5ab938 100644 --- a/silkaj/money/balance.py +++ b/silkaj/money/balance.py @@ -30,7 +30,7 @@ from silkaj.wot import tools as wt @command("balance", help="Get wallet balance") @argument("pubkeys", nargs=-1) @pass_context -def cmd_amount(ctx: Context, pubkeys: str) -> None: +def balance_cmd(ctx: Context, pubkeys: str) -> None: if not has_auth_method(): # check input pubkeys diff --git a/silkaj/money/transfer.py b/silkaj/money/transfer.py index 8a3d22a3ea1328aa6c13709caf24c65a13725161..024ec0cb4c9b56a1e47c180b23a9e647d35c08b9 100644 --- a/silkaj/money/transfer.py +++ b/silkaj/money/transfer.py @@ -116,7 +116,7 @@ relative reference and recipients’ pubkeys", @click.option( "--yes", "-y", is_flag=True, help="Assume yes. Do not prompt confirmation" ) -def send_transaction( +def transfer_money( amounts: List[float], amountsud: List[float], allsources: bool, diff --git a/silkaj/wot/lookup.py b/silkaj/wot/lookup.py index 8ed02536d5174ffda4800278c4572e39f1679f7b..f0fde110d945cbec7aa9e08360fccf638fe07266 100644 --- a/silkaj/wot/lookup.py +++ b/silkaj/wot/lookup.py @@ -24,7 +24,7 @@ from silkaj.wot import tools as wt @click.command("lookup", help="User identifier and public key lookup") @click.argument("uid_pubkey") -def id_pubkey_correspondence(uid_pubkey: str) -> None: +def lookup_cmd(uid_pubkey: str) -> None: checked_pubkey = is_pubkey_and_check(uid_pubkey) if checked_pubkey: uid_pubkey = str(checked_pubkey) diff --git a/silkaj/wot/wot.py b/silkaj/wot/wot.py index 1eb6be7aac52e90904e94b4f5835cb19139a8c22..dfa9ad70d04679c6fd29de9b477e61793b40e748 100644 --- a/silkaj/wot/wot.py +++ b/silkaj/wot/wot.py @@ -50,7 +50,7 @@ def get_sent_certifications( consult the membership status of any given identity", ) @click.argument("uid_pubkey") -def received_sent_certifications(uid_pubkey: str) -> None: +def status(uid_pubkey: str) -> None: """ get searched id get id of received and sent certifications