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

make gen_keypair_file take &str (#4232) 

automerge
This commit is contained in:
Rob Walker 2019-05-08 23:00:48 -07:00 committed by Grimes
parent da4c37beec
commit f7680752e7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keygen/src/keygen.rs
View File

@ -81,7 +81,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
path.to_str().unwrap() path.to_str().unwrap()
}; };
let serialized_keypair = gen_keypair_file(outfile.to_string())?; let serialized_keypair = gen_keypair_file(outfile)?;
if outfile == "-" { if outfile == "-" {
println!("{}", serialized_keypair); println!("{}", serialized_keypair);
} }

6
sdk/src/signature.rs
View File

@ -100,12 +100,12 @@ pub fn read_keypair(path: &str) -> Result<Keypair, Box<error::Error>> {
Ok(keypair) Ok(keypair)
} }
pub fn gen_keypair_file(outfile: String) -> Result<String, Box<error::Error>> { pub fn gen_keypair_file(outfile: &str) -> Result<String, Box<error::Error>> {
let keypair_bytes = Keypair::new().to_bytes(); let keypair_bytes = Keypair::new().to_bytes();
let serialized = serde_json::to_string(&keypair_bytes.to_vec())?; let serialized = serde_json::to_string(&keypair_bytes.to_vec())?;
if outfile != "-" { if outfile != "-" {
if let Some(outdir) = Path::new(&outfile).parent() { if let Some(outdir) = Path::new(outfile).parent() {
fs::create_dir_all(outdir)?; fs::create_dir_all(outdir)?;
} }
let mut f = File::create(outfile)?; let mut f = File::create(outfile)?;
@ -130,7 +130,7 @@ mod tests {
#[test] #[test]
fn test_gen_keypair_file() { fn test_gen_keypair_file() {
let outfile = tmp_file_path("test_gen_keypair_file.json"); let outfile = tmp_file_path("test_gen_keypair_file.json");
let serialized_keypair = gen_keypair_file(outfile.to_string()).unwrap(); let serialized_keypair = gen_keypair_file(&outfile).unwrap();
let keypair_vec: Vec<u8> = serde_json::from_str(&serialized_keypair).unwrap(); let keypair_vec: Vec<u8> = serde_json::from_str(&serialized_keypair).unwrap();
assert!(Path::new(&outfile).exists()); assert!(Path::new(&outfile).exists());
assert_eq!( assert_eq!(

2
wallet/src/main.rs
View File

@ -37,7 +37,7 @@ pub fn parse_args(matches: &ArgMatches<'_>) -> Result<WalletConfig, Box<dyn erro
} else { } else {
path.extend(&[".config", "solana", "id.json"]); path.extend(&[".config", "solana", "id.json"]);
if !path.exists() { if !path.exists() {
gen_keypair_file(path.to_str().unwrap().to_string())?; gen_keypair_file(path.to_str().unwrap())?;
println!("New keypair generated at: {:?}", path.to_str().unwrap()); println!("New keypair generated at: {:?}", path.to_str().unwrap());
} }