blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[clap-v3-utils] Add `try_get_language` and deprecate `acquire_language` (#430)

This commit is contained in:
samkim-crypto 2024-03-27 02:51:54 +09:00 committed by GitHub
parent bcf3d809c9
commit 01314a4fc3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
clap-v3-utils/src/keygen/mnemonic.rs
View File

@ -51,19 +51,21 @@ pub fn try_get_word_count(matches: &ArgMatches) -> Result<Option<usize>, Box<dyn
}))
}
// The constant `POSSIBLE_LANGUAGES` and function `try_get_language` must always be updated in sync
const POSSIBLE_LANGUAGES: &[&str] = &[
"english",
"chinese-simplified",
"chinese-traditional",
"japanese",
"spanish",
"korean",
"french",
"italian",
];
pub fn language_arg<'a>() -> Arg<'a> {
Arg::new(LANGUAGE_ARG.name)
.long(LANGUAGE_ARG.long)
.value_parser(PossibleValuesParser::new([
"english",
"chinese-simplified",
"chinese-traditional",
"japanese",
"spanish",
"korean",
"french",
"italian",
]))
.value_parser(PossibleValuesParser::new(POSSIBLE_LANGUAGES))
.default_value("english")
.value_name("LANGUAGE")
.takes_value(true)
@ -77,6 +79,7 @@ pub fn no_passphrase_arg<'a>() -> Arg<'a> {
.help(NO_PASSPHRASE_ARG.help)
}
#[deprecated(since = "2.0.0", note = "Please use `try_get_language` instead")]
pub fn acquire_language(matches: &ArgMatches) -> Language {
match matches
.get_one::<String>(LANGUAGE_ARG.name)
@ -95,6 +98,22 @@ pub fn acquire_language(matches: &ArgMatches) -> Language {
}
}
pub fn try_get_language(matches: &ArgMatches) -> Result<Option<Language>, Box<dyn error::Error>> {
Ok(matches
.try_get_one::<String>(LANGUAGE_ARG.name)?
.map(|language| match language.as_str() {
"english" => Language::English,
"chinese-simplified" => Language::ChineseSimplified,
"chinese-traditional" => Language::ChineseTraditional,
"japanese" => Language::Japanese,
"spanish" => Language::Spanish,
"korean" => Language::Korean,
"french" => Language::French,
"italian" => Language::Italian,
_ => unreachable!(),
}))
}
pub fn no_passphrase_and_message() -> (String, String) {
(NO_PASSPHRASE.to_string(), "".to_string())
}