gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup pubkey parsing copypasta

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-20 16:20:31 -06:00
committed by Grimes
parent 4107d70e93
commit 63e8496473
2 changed files with 41 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wallet/src/main.rs
View File

@@ -2,6 +2,7 @@ use clap::{
crate_description, crate_name, crate_version, App, AppSettings, Arg, ArgGroup, ArgMatches,
SubCommand,
};
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{gen_keypair_file, read_keypair, KeypairUtil};
use solana_wallet::wallet::{parse_command, process_command, WalletConfig, WalletError};
use std::error;
@@ -79,6 +80,14 @@ pub fn parse_args(matches: &ArgMatches<'_>) -> Result<WalletConfig, Box<dyn erro
})
}
// Return an error if a pubkey cannot be parsed.
fn is_pubkey(string: String) -> Result<(), String> {
match string.parse::<Pubkey>() {
Ok(_) => Ok(()),
Err(err) => Err(format!("{:?}", err)),
}
}
fn main() -> Result<(), Box<dyn error::Error>> {
solana_logger::setup();
@@ -170,6 +179,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_name("PROCESS_ID")
.takes_value(true)
.required(true)
.validator(is_pubkey)
.help("The process id of the transfer to cancel"),
),
)
@@ -199,6 +209,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.long("delegate-account")
.value_name("PUBKEY")
.takes_value(true)
.validator(is_pubkey)
.help("Address to delegate this vote account to"),
)
.arg(
@@ -206,6 +217,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.long("authorize-voter")
.value_name("PUBKEY")
.takes_value(true)
.validator(is_pubkey)
.help("Vote signer to authorize"),
),
)
@@ -218,6 +230,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_name("PUBKEY")
.takes_value(true)
.required(true)
.validator(is_pubkey)
.help("Staking account address to fund"),
)
.arg(
@@ -253,6 +266,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_name("PUBKEY")
.takes_value(true)
.required(true)
.validator(is_pubkey)
.help("The pubkey of recipient"),
)
.arg(
@@ -276,6 +290,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_name("PUBKEY")
.takes_value(true)
.requires("timestamp")
.validator(is_pubkey)
.help("Require timestamp from this third party"),
)
.arg(
@@ -285,6 +300,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.takes_value(true)
.multiple(true)
.use_delimiter(true)
.validator(is_pubkey)
.help("Any third party signatures required to unlock the lamports"),
)
.arg(
@@ -302,6 +318,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_name("PUBKEY")
.takes_value(true)
.required(true)
.validator(is_pubkey)
.help("The pubkey of recipient"),
)
.arg(
@@ -322,6 +339,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_name("PUBKEY")
.takes_value(true)
.required(true)
.validator(is_pubkey)
.help("The pubkey of recipient"),
)
.arg(