From 648c8cb8cfd9be34347e0ace0491d3fdc92ead9d Mon Sep 17 00:00:00 2001
From: lwshang <lwshang@users.noreply.github.com>
Date: Wed, 18 Mar 2020 05:32:03 -0400
Subject: [PATCH] Print non-output messages to stderr in subkey (#5286)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>
---
 substrate/bin/utils/subkey/src/main.rs   | 5 ++---
 substrate/bin/utils/subkey/src/rpc.rs    | 2 +-
 substrate/bin/utils/subkey/src/vanity.rs | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/substrate/bin/utils/subkey/src/main.rs b/substrate/bin/utils/subkey/src/main.rs
index 33209692ca..ae020a062f 100644
--- a/substrate/bin/utils/subkey/src/main.rs
+++ b/substrate/bin/utils/subkey/src/main.rs
@@ -81,7 +81,7 @@ trait Crypto: Sized {
 	{
 		if let Ok((pair, seed)) = Self::Pair::from_phrase(uri, password) {
 			let public_key = Self::public_from_pair(&pair);
-			
+
 			match output {
 				OutputType::Json => {
 					let json = json!({
@@ -135,7 +135,6 @@ trait Crypto: Sized {
 					);
 				},
 			}
-			
 		} else if let Ok((public_key, v)) =
 			<Self::Pair as Pair>::Public::from_string_with_version(uri)
 		{
@@ -167,7 +166,7 @@ trait Crypto: Sized {
 				},
 			}
 		} else {
-			println!("Invalid phrase/URI given");
+			eprintln!("Invalid phrase/URI given");
 		}
 	}
 }
diff --git a/substrate/bin/utils/subkey/src/rpc.rs b/substrate/bin/utils/subkey/src/rpc.rs
index 7b3cde5958..e08ccc19a2 100644
--- a/substrate/bin/utils/subkey/src/rpc.rs
+++ b/substrate/bin/utils/subkey/src/rpc.rs
@@ -42,7 +42,7 @@ impl RpcClient {
 					client.insert_key(key_type, suri, public).map(|_| ())
 				})
 				.map_err(|e| {
-					println!("Error inserting key: {:?}", e);
+					eprintln!("Error inserting key: {:?}", e);
 				})
 		);
 	}
diff --git a/substrate/bin/utils/subkey/src/vanity.rs b/substrate/bin/utils/subkey/src/vanity.rs
index ff8703a990..8a167cd062 100644
--- a/substrate/bin/utils/subkey/src/vanity.rs
+++ b/substrate/bin/utils/subkey/src/vanity.rs
@@ -69,7 +69,7 @@ pub(super) fn generate_key<C: Crypto>(desired: &str) -> Result<KeyPair<C>, &'sta
 		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 mut best = 0;
@@ -94,14 +94,14 @@ pub(super) fn generate_key<C: Crypto>(desired: &str) -> Result<KeyPair<C>, &'sta
 				score: score,
 			};
 			if best >= top {
-				println!("best: {} == top: {}", best, top);
+				eprintln!("best: {} == top: {}", best, top);
 				return Ok(keypair);
 			}
 		}
 		done += 1;
 
 		if done % good_waypoint(done) == 0 {
-			println!("{} keys searched; best is {}/{} complete", done, best, top);
+			eprintln!("{} keys searched; best is {}/{} complete", done, best, top);
 		}
 	}
 }