Skip to content
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

Fix typo in help/error messages #820

Merged
merged 3 commits into from
Jul 4, 2024
Merged

Fix typo in help/error messages #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4132d7
Fix hlint warning
smelc Jul 2, 2024
20cc440
Fix typo in help/error messages
smelc Jul 4, 2024
cf6ddd5
Adapt golden files
smelc Jul 4, 2024
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 cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ pHexHash a mErrPrefix =
. deserialiseFromRawBytesHex (AsHash a)
. BSC.pack
where
errPrefix = maybe "" ((<>) ": ") mErrPrefix
errPrefix = maybe "" (": " <>) mErrPrefix

pBech32KeyHash :: SerialiseAsBech32 (Hash a) => AsType a -> ReadM (Hash a)
pBech32KeyHash a =
Expand Down Expand Up @@ -660,7 +660,7 @@ pAddCommitteeColdVerificationKeyHash =
where
deserialiseFromHex :: String -> Either String (Hash CommitteeColdKey)
deserialiseFromHex =
first (\e -> docToString $ "Invalid Consitutional Committee cold key hash: " <> prettyError e)
first (\e -> docToString $ "Invalid Constitutional Committee cold key hash: " <> prettyError e)
. deserialiseFromRawBytesHex (AsHash AsCommitteeColdKey)
. BSC.pack

Expand Down Expand Up @@ -690,7 +690,7 @@ pAddCommitteeColdVerificationKeyFile =
fmap File $ Opt.strOption $ mconcat
[ Opt.long "add-cc-cold-verification-key-file"
, Opt.metavar "FILE"
, Opt.help "Filepath of the Consitutional Committee cold key."
, Opt.help "Filepath of the Constitutional Committee cold key."
, Opt.completer (Opt.bashCompleter "file")
]

Expand Down Expand Up @@ -755,7 +755,7 @@ pRemoveCommitteeColdVerificationKeyFile =
fmap File $ Opt.strOption $ mconcat
[ Opt.long "remove-cc-cold-verification-key-file"
, Opt.metavar "FILE"
, Opt.help "Filepath of the Consitutional Committee cold key."
, Opt.help "Filepath of the Constitutional Committee cold key."
, Opt.completer (Opt.bashCompleter "file")
]

Expand Down Expand Up @@ -796,7 +796,7 @@ pCommitteeColdVerificationKeyFile =
fmap File $ Opt.strOption $ mconcat
[ Opt.long "cold-verification-key-file"
, Opt.metavar "FILE"
, Opt.help "Filepath of the Consitutional Committee cold key."
, Opt.help "Filepath of the Constitutional Committee cold key."
, Opt.completer (Opt.bashCompleter "file")
]

Expand Down Expand Up @@ -867,14 +867,14 @@ deserialiseHotCCKeyFromHex =

deserialiseHotCCKeyHashFromHex :: ReadM (Hash CommitteeHotKey)
deserialiseHotCCKeyHashFromHex =
pHexHash AsCommitteeHotKey (Just "Invalid Consitutional Committee hot key hash")
pHexHash AsCommitteeHotKey (Just "Invalid Constitutional Committee hot key hash")

pCommitteeHotVerificationKeyFile :: String -> Parser (VerificationKeyFile In)
pCommitteeHotVerificationKeyFile longFlag =
fmap File $ Opt.strOption $ mconcat
[ Opt.long longFlag
, Opt.metavar "FILE"
, Opt.help "Filepath of the Consitutional Committee hot key."
, Opt.help "Filepath of the Constitutional Committee hot key."
, Opt.completer (Opt.bashCompleter "file")
]

Expand Down
4 changes: 2 additions & 2 deletions ...i/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Available options:
--remove-cc-cold-verification-key STRING
Constitutional Committee cold key (hex-encoded).
--remove-cc-cold-verification-key-file FILE
Filepath of the Consitutional Committee cold key.
Filepath of the Constitutional Committee cold key.
--remove-cc-cold-verification-key-hash STRING
Constitutional Committee key hash (hex-encoded).
--remove-cc-cold-script-hash HASH
Expand All @@ -60,7 +60,7 @@ Available options:
--add-cc-cold-verification-key STRING
Constitutional Committee cold key (hex-encoded).
--add-cc-cold-verification-key-file FILE
Filepath of the Consitutional Committee cold key.
Filepath of the Constitutional Committee cold key.
--add-cc-cold-verification-key-hash STRING
Constitutional Committee key hash (hex-encoded).
--add-cc-cold-script-hash HASH
Expand Down
2 changes: 1 addition & 1 deletion ...files/golden/help/conway_governance_committee_create-cold-key-resignation-certificate.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Available options:
--cold-verification-key STRING
Constitutional Committee cold key (hex-encoded).
--cold-verification-key-file FILE
Filepath of the Consitutional Committee cold key.
Filepath of the Constitutional Committee cold key.
--cold-verification-key-hash STRING
Constitutional Committee key hash (hex-encoded).
--cold-script-hash HASH Committee cold Native or Plutus script file hash
Expand Down
4 changes: 2 additions & 2 deletions ...iles/golden/help/conway_governance_committee_create-hot-key-authorization-certificate.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Available options:
--cold-verification-key STRING
Constitutional Committee cold key (hex-encoded).
--cold-verification-key-file FILE
Filepath of the Consitutional Committee cold key.
Filepath of the Constitutional Committee cold key.
--cold-verification-key-hash STRING
Constitutional Committee key hash (hex-encoded).
--cold-script-hash HASH Committee cold Native or Plutus script file hash
Expand All @@ -29,7 +29,7 @@ Available options:
--hot-verification-key STRING
Constitutional Committee hot key (hex-encoded).
--hot-verification-key-file FILE
Filepath of the Consitutional Committee hot key.
Filepath of the Constitutional Committee hot key.
--hot-verification-key-hash STRING
Constitutional Committee key hash (hex-encoded).
--hot-script-hash HASH Committee hot Native or Plutus script file hash
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_vote_create.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Available options:
--cc-hot-verification-key STRING
Constitutional Committee hot key (hex-encoded).
--cc-hot-verification-key-file FILE
Filepath of the Consitutional Committee hot key.
Filepath of the Constitutional Committee hot key.
--cc-hot-key-hash STRING Constitutional Committee key hash (hex-encoded).
--cc-hot-script-hash HASH
Cold Native or Plutus script file hash (hex-encoded).
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_committee-state.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ Available options:
--cold-verification-key STRING
Constitutional Committee cold key (hex-encoded).
--cold-verification-key-file FILE
Filepath of the Consitutional Committee cold key.
Filepath of the Constitutional Committee cold key.
--cold-verification-key-hash STRING
Constitutional Committee key hash (hex-encoded).
--cold-script-hash HASH Cold Native or Plutus script file hash (hex-encoded).
Obtain it with "cardano-cli hash script ...".
--hot-key STRING Constitutional Committee hot key (hex-encoded).
--hot-key-file FILE Filepath of the Consitutional Committee hot key.
--hot-key-file FILE Filepath of the Constitutional Committee hot key.
--hot-key-hash STRING Constitutional Committee key hash (hex-encoded).
--hot-script-hash HASH Hot Native or Plutus script file hash (hex-encoded).
Obtain it with "cardano-cli hash script ...".
Expand Down
Loading