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

Improve error message when unable to read a file (#6978)

Browse Source
This commit is contained in:
Michael Vines
2019-11-15 10:39:05 -07:00
committed by GitHub
parent 59413b3124
commit 892ca196f1
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
genesis/src/main.rs
View File

@ -33,6 +33,7 @@ pub enum AccountFileFormat {
fn pubkey_from_file(key_file: &str) -> Result<Pubkey, Box<dyn error::Error>> { fn pubkey_from_file(key_file: &str) -> Result<Pubkey, Box<dyn error::Error>> {
read_pubkey_file(key_file) read_pubkey_file(key_file)
.or_else(|_| read_keypair_file(key_file).map(|keypair| keypair.pubkey())) .or_else(|_| read_keypair_file(key_file).map(|keypair| keypair.pubkey()))
.map_err(|err| format!("Failed to read {}: {}", key_file, err).into())
} }
fn pubkey_from_str(key_str: &str) -> Result<Pubkey, Box<dyn error::Error>> { fn pubkey_from_str(key_str: &str) -> Result<Pubkey, Box<dyn error::Error>> {