Skip to content

fix: normalize error message prefix to ERROR: for consistency [fj4WqyCCw3C5ShR1RfB7MoBPTpkRrBFYP1uT35g3MvT] #8092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: normalize error message prefix to ERROR: for consistency [fj4WqyCCw3C5ShR1RfB7MoBPTpkRrBFYP1uT35g3MvT] #8092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions tools/rustchain_wallet_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,14 @@ def _sign_transfer(

def cmd_create(args):
if Mnemonic is None:
print("Error: missing dependency 'mnemonic'. Install: python3 -m pip install mnemonic", file=sys.stderr)
print("ERROR: missing dependency 'mnemonic'. Install: python3 -m pip install mnemonic", file=sys.stderr)
return EXIT_USAGE_ERROR

wallet_name = args.name or f"wallet-{int(time.time())}"
password = _read_password("Set wallet password: ", "RUSTCHAIN_WALLET_PASSWORD")
confirm = _read_password("Confirm password: ", "RUSTCHAIN_WALLET_PASSWORD_CONFIRM")
if password != confirm:
print("Error: password mismatch", file=sys.stderr)
print("ERROR: password mismatch", file=sys.stderr)
return EXIT_USAGE_ERROR

m = Mnemonic("english")
Expand Down Expand Up @@ -246,15 +246,15 @@ def cmd_create(args):

def cmd_import(args):
if Mnemonic is None:
print("Error: missing dependency 'mnemonic'. Install: python3 -m pip install mnemonic", file=sys.stderr)
print("ERROR: missing dependency 'mnemonic'. Install: python3 -m pip install mnemonic", file=sys.stderr)
return EXIT_USAGE_ERROR

phrase = args.mnemonic.strip().lower()
wallet_name = args.name or f"imported-{int(time.time())}"
password = _read_password("Set wallet password: ", "RUSTCHAIN_WALLET_PASSWORD")
confirm = _read_password("Confirm password: ", "RUSTCHAIN_WALLET_PASSWORD_CONFIRM")
if password != confirm:
print("Error: password mismatch", file=sys.stderr)
print("ERROR: password mismatch", file=sys.stderr)
return EXIT_USAGE_ERROR

priv_hex, pub_hex = _derive_ed25519_from_mnemonic(phrase)
Expand Down Expand Up @@ -292,7 +292,7 @@ def _safe_json(r: "requests.Response") -> "tuple[dict | list | None, int]":
return r.json(), EXIT_SUCCESS if r.ok else EXIT_BAD_RESPONSE
except Exception:
print(
f"Error: Server returned HTTP {r.status_code} with non-JSON body"
f"ERROR: Server returned HTTP {r.status_code} with non-JSON body"
f" (check node URL / connectivity)",
file=sys.stderr,
)
Expand All @@ -304,7 +304,7 @@ def _safe_json_object(r: "requests.Response") -> "tuple[dict | None, int]":
if data is None:
return None, rc
if not isinstance(data, dict):
print("Error: Server returned JSON but not an object", file=sys.stderr)
print("ERROR: Server returned JSON but not an object", file=sys.stderr)
return None, EXIT_BAD_RESPONSE
return data, rc

Expand Down Expand Up @@ -478,7 +478,7 @@ def main():
try:
return args.func(args)
except Exception as e:
print(f"Error: {e}", file=sys.stderr)
print(f"ERROR: {e}", file=sys.stderr)
return EXIT_UNKNOWN_ERROR


Expand Down