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

Remove manually created help text, use clap's text instead.

Browse Source
This commit is contained in:
Michael Vines
2018-08-06 16:13:20 -07:00
parent 78a4b1287d
commit 5dc7177540
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/wallet.rs
View File

@ -155,7 +155,6 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
path.to_str().unwrap() path.to_str().unwrap()
}; };
let id = read_keypair(id_path).or_else(|err| { let id = read_keypair(id_path).or_else(|err| {
display_actions();
Err(WalletError::BadParameter(format!( Err(WalletError::BadParameter(format!(
"{}: Unable to open keypair file: {}", "{}: Unable to open keypair file: {}",
err, id_path err, id_path
@ -177,7 +176,7 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
.expect("base58-encoded public key"); .expect("base58-encoded public key");
if pubkey_vec.len() != std::mem::size_of::<PublicKey>() { if pubkey_vec.len() != std::mem::size_of::<PublicKey>() {
display_actions(); eprintln!("{}", pay_matches.usage());
Err(WalletError::BadParameter("Invalid public key".to_string()))?; Err(WalletError::BadParameter("Invalid public key".to_string()))?;
} }
PublicKey::new(&pubkey_vec) PublicKey::new(&pubkey_vec)
@ -198,14 +197,14 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
let sig = Signature::new(&sig_vec); let sig = Signature::new(&sig_vec);
Ok(WalletCommand::Confirm(sig)) Ok(WalletCommand::Confirm(sig))
} else { } else {
display_actions(); eprintln!("{}", confirm_matches.usage());
Err(WalletError::BadParameter("Invalid signature".to_string())) Err(WalletError::BadParameter("Invalid signature".to_string()))
} }
} }
("balance", Some(_balance_matches)) => Ok(WalletCommand::Balance), ("balance", Some(_balance_matches)) => Ok(WalletCommand::Balance),
("address", Some(_address_matches)) => Ok(WalletCommand::Address), ("address", Some(_address_matches)) => Ok(WalletCommand::Address),
("", None) => { ("", None) => {
display_actions(); println!("{}", matches.usage());
Err(WalletError::CommandNotRecognized( Err(WalletError::CommandNotRecognized(
"no subcommand given".to_string(), "no subcommand given".to_string(),
)) ))
@ -290,17 +289,6 @@ fn process_command(
Ok(()) Ok(())
} }
fn display_actions() {
println!();
println!("Commands:");
println!(" address Get your public key");
println!(" balance Get your account balance");
println!(" airdrop Request a batch of tokens");
println!(" pay Send tokens to a public key");
println!(" confirm Confirm your last payment by signature");
println!();
}
fn read_leader(path: &str) -> Result<Config, WalletError> { fn read_leader(path: &str) -> Result<Config, WalletError> {
let file = File::open(path.to_string()).or_else(|err| { let file = File::open(path.to_string()).or_else(|err| {
Err(WalletError::BadParameter(format!( Err(WalletError::BadParameter(format!(