Fail gracefully when keypair file is unreadable
This commit is contained in:
parent
fa1cdaa91a
commit
18e6ff4167
|
@ -155,7 +155,13 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
|
||||||
path.extend(&[".config", "solana", "id.json"]);
|
path.extend(&[".config", "solana", "id.json"]);
|
||||||
path.to_str().unwrap()
|
path.to_str().unwrap()
|
||||||
};
|
};
|
||||||
let id = read_keypair(id_path).expect("client keypair");
|
let id = read_keypair(id_path).or_else(|err| {
|
||||||
|
display_actions();
|
||||||
|
Err(WalletError::BadParameter(format!(
|
||||||
|
"{}: Unable to open keypair file: {}",
|
||||||
|
err, id_path
|
||||||
|
)))
|
||||||
|
})?;
|
||||||
|
|
||||||
let mut drone_addr = leader.contact_info.tpu;
|
let mut drone_addr = leader.contact_info.tpu;
|
||||||
drone_addr.set_port(9900);
|
drone_addr.set_port(9900);
|
||||||
|
|
Loading…
Reference in New Issue