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

updated bs58 decode check

Browse Source
This commit is contained in:
Jon-Eric Cook
2020-01-27 10:16:20 -08:00
committed by Michael Vines
parent 01b1e287ed
commit e282161872
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
keygen/src/keygen.rs
View File

@ -78,15 +78,10 @@ fn grind_validator_starts_with(v: String) -> Result<(), String> {
return Err(String::from("Expected : between PREFIX and COUNT")); return Err(String::from("Expected : between PREFIX and COUNT"));
} }
let args: Vec<&str> = v.split(':').collect(); let args: Vec<&str> = v.split(':').collect();
let s = bs58::decode(&args[0]).into_vec() bs58::decode(&args[0]).into_vec().map_err(|err| format!("{}: {:?}", args[0], err))?;
.map(|_| ())
.map_err(|err| format!("{}: {:?}", args[0], err));
if s.is_err() {
return s;
}
let count = args[1].parse::<u64>(); let count = args[1].parse::<u64>();
if count.is_err() || count.unwrap() == 0 { if count.is_err() || count.unwrap() == 0 {
return Err(String::from("Expected COUNT to be of type u32")); return Err(String::from("Expected COUNT to be of type u64"));
} }
Ok(()) Ok(())
} }
@ -96,15 +91,10 @@ fn grind_validator_ends_with(v: String) -> Result<(), String> {
return Err(String::from("Expected : between SUFFIX and COUNT")); return Err(String::from("Expected : between SUFFIX and COUNT"));
} }
let args: Vec<&str> = v.split(':').collect(); let args: Vec<&str> = v.split(':').collect();
let s = bs58::decode(&args[0]).into_vec() bs58::decode(&args[0]).into_vec().map_err(|err| format!("{}: {:?}", args[0], err))?;
.map(|_| ())
.map_err(|err| format!("{}: {:?}", args[0], err));
if s.is_err() {
return s;
}
let count = args[1].parse::<u64>(); let count = args[1].parse::<u64>();
if count.is_err() || count.unwrap() == 0 { if count.is_err() || count.unwrap() == 0 {
return Err(String::from("Expected COUNT to be of type u32")); return Err(String::from("Expected COUNT to be of type u64"));
} }
Ok(()) Ok(())
} }
@ -114,21 +104,11 @@ fn grind_validator_starts_and_ends_with(v: String) -> Result<(), String> {
return Err(String::from("Expected : between PREFIX and SUFFIX and COUNT")); return Err(String::from("Expected : between PREFIX and SUFFIX and COUNT"));
} }
let args: Vec<&str> = v.split(':').collect(); let args: Vec<&str> = v.split(':').collect();
let p = bs58::decode(&args[0]).into_vec() bs58::decode(&args[0]).into_vec().map_err(|err| format!("{}: {:?}", args[0], err))?;
.map(|_| ()) bs58::decode(&args[1]).into_vec().map_err(|err| format!("{}: {:?}", args[1], err))?;
.map_err(|err| format!("{}: {:?}", args[0], err));
if p.is_err() {
return p;
}
let s = bs58::decode(&args[1]).into_vec()
.map(|_| ())
.map_err(|err| format!("{}: {:?}", args[1], err));
if s.is_err() {
return s;
}
let count = args[2].parse::<u64>(); let count = args[2].parse::<u64>();
if count.is_err() || count.unwrap() == 0 { if count.is_err() || count.unwrap() == 0 {
return Err(String::from("Expected COUNT to be a u32")); return Err(String::from("Expected COUNT to be a u64"));
} }
Ok(()) Ok(())
} }