From eacfacc8169ee7dc82767c9955129da75725347b Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Mon, 14 May 2018 10:11:10 +0200
Subject: [PATCH] Remove manually added text to the errors (#8595)

These messages were confusing for the users especially the help message.
---
 whisper/cli/src/main.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/whisper/cli/src/main.rs b/whisper/cli/src/main.rs
index c3a4dc8c3a2..f245e99e482 100644
--- a/whisper/cli/src/main.rs
+++ b/whisper/cli/src/main.rs
@@ -170,12 +170,12 @@ impl From<String> for Error {
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
 		match *self {
-			Error::SockAddr(ref e) => write!(f, "SockAddrError: {}", e),
-			Error::Docopt(ref e) => write!(f, "DocoptError: {}", e),
-			Error::Io(ref e) => write!(f, "IoError: {}", e),
-			Error::JsonRpc(ref e) => write!(f, "JsonRpcError: {:?}", e),
-			Error::Network(ref e) => write!(f, "NetworkError: {}", e),
-			Error::Logger(ref e) => write!(f, "LoggerError: {}", e),
+			Error::SockAddr(ref e) => write!(f, "{}", e),
+			Error::Docopt(ref e) => write!(f, "{}", e),
+			Error::Io(ref e) => write!(f, "{}", e),
+			Error::JsonRpc(ref e) => write!(f, "{:?}", e),
+			Error::Network(ref e) => write!(f, "{}", e),
+			Error::Logger(ref e) => write!(f, "{}", e),
 		}
 	}
 }
@@ -252,7 +252,6 @@ fn initialize_logger(log_level: String) -> Result<(), String> {
 	Ok(())
 }
 
-
 #[cfg(test)]
 mod tests {
 	use super::execute;