From 72cfdf20c9623664e8c2c4363a940674bb72ce18 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 30 Jan 2020 08:25:42 +0100 Subject: [PATCH] Fix faucet binary name --- faucet.Dockerfile | 2 +- packages/faucet/README.md | 4 ++-- packages/faucet/bin/{cosm-faucet => cosmwasm-faucet} | 0 packages/faucet/package.json | 2 +- packages/faucet/src/actions/generate.ts | 5 ++++- packages/faucet/src/actions/help.ts | 2 +- packages/faucet/src/actions/start/start.ts | 4 +++- packages/faucet/src/constants.ts | 1 + 8 files changed, 13 insertions(+), 7 deletions(-) rename packages/faucet/bin/{cosm-faucet => cosmwasm-faucet} (100%) diff --git a/faucet.Dockerfile b/faucet.Dockerfile index 51cbb8d6..95be7c2c 100644 --- a/faucet.Dockerfile +++ b/faucet.Dockerfile @@ -19,5 +19,5 @@ WORKDIR /run_repo_root RUN yarn install --frozen-lockfile --production EXPOSE 8000 -ENTRYPOINT ["/run_repo_root/packages/faucet/bin/cosm-faucet"] +ENTRYPOINT ["/run_repo_root/packages/faucet/bin/cosmwasm-faucet"] CMD [""] diff --git a/packages/faucet/README.md b/packages/faucet/README.md index 63ba5f98..e600edeb 100644 --- a/packages/faucet/README.md +++ b/packages/faucet/README.md @@ -21,13 +21,13 @@ FAUCET_CREDIT_AMOUNT_COSM=10 \ FAUCET_CREDIT_AMOUNT_STAKE=5 \ FAUCET_CONCURRENCY=3 \ FAUCET_MNEMONIC="economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone" \ - ./bin/cosm-faucet start cosmwasm "http://localhost:1317" + ./bin/cosmwasm-faucet start cosmwasm "http://localhost:1317" ``` ## Usage ``` -sage: cosmwasm-faucet action [arguments...] +Usage: cosmwasm-faucet action [arguments...] Positional arguments per action are listed below. Arguments in parentheses are optional. diff --git a/packages/faucet/bin/cosm-faucet b/packages/faucet/bin/cosmwasm-faucet similarity index 100% rename from packages/faucet/bin/cosm-faucet rename to packages/faucet/bin/cosmwasm-faucet diff --git a/packages/faucet/package.json b/packages/faucet/package.json index 4c234aee..8cd0f35c 100644 --- a/packages/faucet/package.json +++ b/packages/faucet/package.json @@ -21,7 +21,7 @@ "access": "public" }, "scripts": { - "dev-start": "FAUCET_CREDIT_AMOUNT_COSM=10 FAUCET_CREDIT_AMOUNT_STAKE=5 FAUCET_CONCURRENCY=3 FAUCET_MNEMONIC=\"economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone\" ./bin/cosm-faucet start cosmwasm \"http://localhost:1317\"", + "dev-start": "FAUCET_CREDIT_AMOUNT_COSM=10 FAUCET_CREDIT_AMOUNT_STAKE=5 FAUCET_CONCURRENCY=3 FAUCET_MNEMONIC=\"economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone\" ./bin/cosmwasm-faucet start cosmwasm \"http://localhost:1317\"", "docs": "shx rm -rf docs && typedoc --options typedoc.js", "format": "prettier --write --loglevel warn \"./src/**/*.ts\"", "lint": "eslint --max-warnings 0 \"**/*.{js,ts}\" && tslint -t verbose --project .", diff --git a/packages/faucet/src/actions/generate.ts b/packages/faucet/src/actions/generate.ts index 3ca673d2..da95af92 100644 --- a/packages/faucet/src/actions/generate.ts +++ b/packages/faucet/src/actions/generate.ts @@ -3,11 +3,14 @@ import { Bip39, Random } from "@iov/crypto"; import { UserProfile } from "@iov/keycontrol"; import { codecFromString } from "../codec"; +import * as constants from "../constants"; import { setSecretAndCreateIdentities } from "../profile"; export async function generate(args: ReadonlyArray): Promise { if (args.length < 2) { - throw Error(`Not enough arguments for action 'generate'. See 'iov-faucet help' or README for arguments.`); + throw Error( + `Not enough arguments for action 'generate'. See '${constants.binaryName} help' or README for arguments.`, + ); } const codecName = codecFromString(args[0]); const chainId = args[1] as ChainId; diff --git a/packages/faucet/src/actions/help.ts b/packages/faucet/src/actions/help.ts index 039655cc..8b7a6a5f 100644 --- a/packages/faucet/src/actions/help.ts +++ b/packages/faucet/src/actions/help.ts @@ -1,4 +1,4 @@ -const binaryName = "cosmwasm-faucet"; +import { binaryName } from "../constants"; export function help(): void { const out = ` diff --git a/packages/faucet/src/actions/start/start.ts b/packages/faucet/src/actions/start/start.ts index beb9ea1d..fdb745fb 100644 --- a/packages/faucet/src/actions/start/start.ts +++ b/packages/faucet/src/actions/start/start.ts @@ -36,7 +36,9 @@ function getCount(): number { export async function start(args: ReadonlyArray): Promise { if (args.length < 2) { - throw Error(`Not enough arguments for action 'start'. See 'iov-faucet help' or README for arguments.`); + throw Error( + `Not enough arguments for action 'start'. See '${constants.binaryName} help' or README for arguments.`, + ); } const codec = codecFromString(args[0]); const blockchainBaseUrl: string = args[1]; diff --git a/packages/faucet/src/constants.ts b/packages/faucet/src/constants.ts index a28481d1..616d1acd 100644 --- a/packages/faucet/src/constants.ts +++ b/packages/faucet/src/constants.ts @@ -1,3 +1,4 @@ +export const binaryName = "cosmwasm-faucet"; export const concurrency: number = Number.parseInt(process.env.FAUCET_CONCURRENCY || "", 10) || 5; export const port: number = Number.parseInt(process.env.FAUCET_PORT || "", 10) || 8000; export const mnemonic: string | undefined = process.env.FAUCET_MNEMONIC;