From 21dad1d41ec3d1336a9a6a7c7e8eb4c9194dc2bd Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Wed, 9 May 2018 23:25:58 +0200
Subject: [PATCH] Rename `whisper-cli binary` to `whisper` (#8579)

* rename whisper-cli binary to whisper

* fix tests
---
 whisper/cli/Cargo.toml  |  4 +++-
 whisper/cli/src/main.rs | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/whisper/cli/Cargo.toml b/whisper/cli/Cargo.toml
index 363471a1a..9aea1a877 100644
--- a/whisper/cli/Cargo.toml
+++ b/whisper/cli/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "whisper-cli"
+description = "Whisper command line interface"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+license = "GPL-3.0"
 
 [dependencies]
 ethcore-network-devp2p = { path = "../../util/network-devp2p" }
@@ -18,5 +20,5 @@ jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branc
 log = "0.3"
 
 [[bin]]
-name = "whisper-cli"
+name = "whisper"
 path = "src/main.rs"
diff --git a/whisper/cli/src/main.rs b/whisper/cli/src/main.rs
index d0866cd66..f9211b993 100644
--- a/whisper/cli/src/main.rs
+++ b/whisper/cli/src/main.rs
@@ -46,7 +46,7 @@ use jsonrpc_http_server::{AccessControlAllowOrigin, DomainsValidation};
 const POOL_UNIT: usize = 1024 * 1024;
 const USAGE: &'static str = r#"
 Whisper CLI.
-	Copyright 2017 Parity Technologies (UK) Ltd
+	Copyright 2018 Parity Technologies (UK) Ltd
 
 Usage:
 	whisper [options]
@@ -56,7 +56,7 @@ Options:
 	--whisper-pool-size SIZE       Specify Whisper pool size [default: 10].
 	-p, --port PORT                Specify which RPC port to use [default: 8545].
 	-a, --address ADDRESS          Specify which address to use [default: 127.0.0.1].
-	-l, --log LEVEL				   Specify the logging level. Must conform to the same format as RUST_LOG [default: Error].
+	-l, --log LEVEL                Specify the logging level. Must conform to the same format as RUST_LOG [default: Error].
 	-h, --help                     Display this message and exit.
 "#;
 
@@ -259,7 +259,7 @@ mod tests {
 
 	#[test]
 	fn invalid_argument() {
-		let command = vec!["whisper-cli", "--foo=12"]
+		let command = vec!["whisper", "--foo=12"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();
@@ -270,7 +270,7 @@ mod tests {
 	#[test]
 	#[ignore]
 	fn privileged_port() {
-		let command = vec!["whisper-cli", "--port=3"]
+		let command = vec!["whisper", "--port=3"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();
@@ -280,7 +280,7 @@ mod tests {
 
 	#[test]
 	fn invalid_ip_address() {
-		let command = vec!["whisper-cli", "--address=x.x.x.x"]
+		let command = vec!["whisper", "--address=x.x.x.x"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();
@@ -290,7 +290,7 @@ mod tests {
 
 	#[test]
 	fn invalid_whisper_pool_size() {
-		let command = vec!["whisper-cli", "--whisper-pool-size=-100000000000000000000000000000000000000"]
+		let command = vec!["whisper", "--whisper-pool-size=-100000000000000000000000000000000000000"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();