grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename whisper-cli binary to whisper (#8579)

Browse Source 
* rename whisper-cli binary to whisper

* fix tests
This commit is contained in:
Niklas Adolfsson 2018-05-09 23:25:58 +02:00 committed by Afri Schoedon
parent 1d42b7f0d1
commit 21dad1d41e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
whisper/cli/Cargo.toml
View File

@ -1,7 +1,9 @@
[package] [package]
name = "whisper-cli" name = "whisper-cli"
description = "Whisper command line interface"
version = "0.1.0" version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
license = "GPL-3.0"
[dependencies] [dependencies]
ethcore-network-devp2p = { path = "../../util/network-devp2p" } 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" log = "0.3"
[[bin]] [[bin]]
name = "whisper-cli" name = "whisper"
path = "src/main.rs" path = "src/main.rs"

12
whisper/cli/src/main.rs
View File

@ -46,7 +46,7 @@ use jsonrpc_http_server::{AccessControlAllowOrigin, DomainsValidation};
const POOL_UNIT: usize = 1024 * 1024; const POOL_UNIT: usize = 1024 * 1024;
const USAGE: &'static str = r#" const USAGE: &'static str = r#"
Whisper CLI. Whisper CLI.
Copyright 2017 Parity Technologies (UK) Ltd Copyright 2018 Parity Technologies (UK) Ltd
Usage: Usage:
whisper [options] whisper [options]
@ -56,7 +56,7 @@ Options:
--whisper-pool-size SIZE Specify Whisper pool size [default: 10]. --whisper-pool-size SIZE Specify Whisper pool size [default: 10].
-p, --port PORT Specify which RPC port to use [default: 8545]. -p, --port PORT Specify which RPC port to use [default: 8545].
-a, --address ADDRESS Specify which address to use [default: 127.0.0.1]. -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. -h, --help Display this message and exit.
"#; "#;
@ -259,7 +259,7 @@ mod tests {
#[test] #[test]
fn invalid_argument() { fn invalid_argument() {
let command = vec!["whisper-cli", "--foo=12"] let command = vec!["whisper", "--foo=12"]
.into_iter() .into_iter()
.map(Into::into) .map(Into::into)
.collect::<Vec<String>>(); .collect::<Vec<String>>();
@ -270,7 +270,7 @@ mod tests {
#[test] #[test]
#[ignore] #[ignore]
fn privileged_port() { fn privileged_port() {
let command = vec!["whisper-cli", "--port=3"] let command = vec!["whisper", "--port=3"]
.into_iter() .into_iter()
.map(Into::into) .map(Into::into)
.collect::<Vec<String>>(); .collect::<Vec<String>>();
@ -280,7 +280,7 @@ mod tests {
#[test] #[test]
fn invalid_ip_address() { 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() .into_iter()
.map(Into::into) .map(Into::into)
.collect::<Vec<String>>(); .collect::<Vec<String>>();
@ -290,7 +290,7 @@ mod tests {
#[test] #[test]
fn invalid_whisper_pool_size() { fn invalid_whisper_pool_size() {
let command = vec!["whisper-cli", "--whisper-pool-size=-100000000000000000000000000000000000000"] let command = vec!["whisper", "--whisper-pool-size=-100000000000000000000000000000000000000"]
.into_iter() .into_iter()
.map(Into::into) .map(Into::into)
.collect::<Vec<String>>(); .collect::<Vec<String>>();