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

Don't require non-existent param for keygen new (#17896)

This commit is contained in:
Tyera Eulberg 2021-06-11 13:25:03 -06:00 committed by GitHub
parent 0feac57cb0
commit 22c356d24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keygen/src/keygen.rs
View File

@ -106,9 +106,6 @@ fn no_outfile_arg<'a, 'b>() -> Arg<'a, 'b> {
Arg::with_name(NO_OUTFILE_ARG.name)
.long(NO_OUTFILE_ARG.long)
.conflicts_with_all(&["outfile", "silent"])
// Require a seed phrase to avoid generating a keypair
// but having no way to get the private key
.requires("use_mnemonic")
.help(NO_OUTFILE_ARG.help)
}
@ -121,7 +118,6 @@ impl KeyGenerationCommonArgs for App<'_, '_> {
self.arg(word_count_arg())
.arg(language_arg())
.arg(no_passphrase_arg())
.arg(no_outfile_arg())
}
}
@ -395,6 +391,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.help("Do not display seed phrase. Useful when piping output to other programs that prompt for user input, like gpg"),
)
.key_generation_common_args()
.arg(no_outfile_arg())
)
.subcommand(
SubCommand::with_name("grind")
@ -450,6 +447,12 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.help("Generate using a mnemonic key phrase. Expect a significant slowdown in this mode"),
)
.key_generation_common_args()
.arg(
no_outfile_arg()
// Require a seed phrase to avoid generating a keypair
// but having no way to get the private key
.requires("use_mnemonic")
)
)
.subcommand(
SubCommand::with_name("pubkey")