pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 22:01:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Print non-output messages to stderr in subkey (#5286)

Browse Source 
* Print non-output messages to stderr in subkey

* Update bin/utils/subkey/src/main.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
lwshang
2020-03-18 05:32:03 -04:00
committed by GitHub
parent 082b66434e
commit 648c8cb8cf
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/bin/utils/subkey/src/main.rs
+2 -3
View File
@@ -81,7 +81,7 @@ trait Crypto: Sized {
{ {
if let Ok((pair, seed)) = Self::Pair::from_phrase(uri, password) { if let Ok((pair, seed)) = Self::Pair::from_phrase(uri, password) {
let public_key = Self::public_from_pair(&pair); let public_key = Self::public_from_pair(&pair);
match output { match output {
OutputType::Json => { OutputType::Json => {
let json = json!({ let json = json!({
@@ -135,7 +135,6 @@ trait Crypto: Sized {
); );
}, },
} }
} else if let Ok((public_key, v)) = } else if let Ok((public_key, v)) =
<Self::Pair as Pair>::Public::from_string_with_version(uri) <Self::Pair as Pair>::Public::from_string_with_version(uri)
{ {
@@ -167,7 +166,7 @@ trait Crypto: Sized {
}, },
} }
} else { } else {
println!("Invalid phrase/URI given"); eprintln!("Invalid phrase/URI given");
} }
} }
} }
substrate/bin/utils/subkey/src/rpc.rs
+1 -1
View File
@@ -42,7 +42,7 @@ impl RpcClient {
client.insert_key(key_type, suri, public).map(|_| ()) client.insert_key(key_type, suri, public).map(|_| ())
}) })
.map_err(|e| { .map_err(|e| {
println!("Error inserting key: {:?}", e); eprintln!("Error inserting key: {:?}", e);
}) })
); );
} }
substrate/bin/utils/subkey/src/vanity.rs
+3 -3
View File
@@ -69,7 +69,7 @@ pub(super) fn generate_key<C: Crypto>(desired: &str) -> Result<KeyPair<C>, &'sta
return Err("Pattern must not be empty"); return Err("Pattern must not be empty");
} }
println!("Generating key containing pattern '{}'", desired); eprintln!("Generating key containing pattern '{}'", desired);
let top = 45 + (desired.len() * 48); let top = 45 + (desired.len() * 48);
let mut best = 0; let mut best = 0;
@@ -94,14 +94,14 @@ pub(super) fn generate_key<C: Crypto>(desired: &str) -> Result<KeyPair<C>, &'sta
score: score, score: score,
}; };
if best >= top { if best >= top {
println!("best: {} == top: {}", best, top); eprintln!("best: {} == top: {}", best, top);
return Ok(keypair); return Ok(keypair);
} }
} }
done += 1; done += 1;
if done % good_waypoint(done) == 0 { if done % good_waypoint(done) == 0 {
println!("{} keys searched; best is {}/{} complete", done, best, top); eprintln!("{} keys searched; best is {}/{} complete", done, best, top);
} }
} }
} }