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

Use AsRef

This commit is contained in:
Michael Vines 2020-12-16 10:29:23 -08:00 committed by mergify[bot]
parent 41a93ced23
commit 9993d2c623
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk/src/signature.rs
View File

@ -333,9 +333,8 @@ pub fn read_keypair<R: Read>(reader: &mut R) -> Result<Keypair, Box<dyn error::E
Ok(Keypair(dalek_keypair)) Ok(Keypair(dalek_keypair))
} }
pub fn read_keypair_file(path: &str) -> Result<Keypair, Box<dyn error::Error>> { pub fn read_keypair_file<F: AsRef<Path>>(path: F) -> Result<Keypair, Box<dyn error::Error>> {
assert!(path != "-"); let mut file = File::open(path.as_ref())?;
let mut file = File::open(path.to_string())?;
read_keypair(&mut file) read_keypair(&mut file)
} }
@ -349,12 +348,13 @@ pub fn write_keypair<W: Write>(
Ok(serialized) Ok(serialized)
} }
pub fn write_keypair_file( pub fn write_keypair_file<F: AsRef<Path>>(
keypair: &Keypair, keypair: &Keypair,
outfile: &str, outfile: F,
) -> Result<String, Box<dyn error::Error>> { ) -> Result<String, Box<dyn error::Error>> {
assert!(outfile != "-"); let outfile = outfile.as_ref();
if let Some(outdir) = Path::new(outfile).parent() {
if let Some(outdir) = outfile.parent() {
fs::create_dir_all(outdir)?; fs::create_dir_all(outdir)?;
} }