From 894309f77d3da22cff1e4acfb7697c08b53d9577 Mon Sep 17 00:00:00 2001 From: Joshua Mir Date: Wed, 31 Jul 2019 11:51:47 +0200 Subject: [PATCH 1/4] Only remove expanse from cli --- parity/cli/mod.rs | 4 ++-- parity/params.rs | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 2b86f709087..6cca0e09cee 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -300,8 +300,8 @@ usage! { ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(), "--chain=[CHAIN]", - "Specify the blockchain type. CHAIN may be either a JSON chain specification file or ethereum, classic, poacore, volta, ewc, expanse, musicoin, ellaism, mix, callisto, morden, ropsten, kovan, rinkeby, goerli, kotti, poasokol, testnet, or dev.", - + "Specify the blockchain type. CHAIN may be either a JSON chain specification file or ethereum, classic, poacore, volta, ewc, musicoin, ellaism, mix, callisto, morden, ropsten, kovan, rinkeby, goerli, kotti, poasokol, testnet, or dev.", + ARG arg_keys_path: (String) = "$BASE/keys", or |c: &Config| c.parity.as_ref()?.keys_path.clone(), "--keys-path=[PATH]", "Specify the path for JSON key files to be found", diff --git a/parity/params.rs b/parity/params.rs index dbbb6f8be80..b8e634def14 100644 --- a/parity/params.rs +++ b/parity/params.rs @@ -36,7 +36,6 @@ pub enum SpecType { Poanet, Volta, Ewc, - Expanse, Musicoin, Ellaism, Mix, @@ -68,7 +67,6 @@ impl str::FromStr for SpecType { "poanet" | "poacore" => SpecType::Poanet, "volta" => SpecType::Volta, "ewc" | "energyweb" => SpecType::Ewc, - "expanse" => SpecType::Expanse, "musicoin" => SpecType::Musicoin, "ellaism" => SpecType::Ellaism, "mix" => SpecType::Mix, @@ -95,7 +93,6 @@ impl fmt::Display for SpecType { SpecType::Poanet => "poanet", SpecType::Volta => "volta", SpecType::Ewc => "energyweb", - SpecType::Expanse => "expanse", SpecType::Musicoin => "musicoin", SpecType::Ellaism => "ellaism", SpecType::Mix => "mix", @@ -122,7 +119,6 @@ impl SpecType { SpecType::Poanet => Ok(spec::new_poanet(params)), SpecType::Volta => Ok(spec::new_volta(params)), SpecType::Ewc => Ok(spec::new_ewc(params)), - SpecType::Expanse => Ok(spec::new_expanse(params)), SpecType::Musicoin => Ok(spec::new_musicoin(params)), SpecType::Ellaism => Ok(spec::new_ellaism(params)), SpecType::Mix => Ok(spec::new_mix(params)), @@ -145,7 +141,6 @@ impl SpecType { pub fn legacy_fork_name(&self) -> Option { match *self { SpecType::Classic => Some("classic".to_owned()), - SpecType::Expanse => Some("expanse".to_owned()), SpecType::Musicoin => Some("musicoin".to_owned()), _ => None, } @@ -379,7 +374,6 @@ mod tests { assert_eq!(SpecType::Volta, "volta".parse().unwrap()); assert_eq!(SpecType::Ewc, "ewc".parse().unwrap()); assert_eq!(SpecType::Ewc, "energyweb".parse().unwrap()); - assert_eq!(SpecType::Expanse, "expanse".parse().unwrap()); assert_eq!(SpecType::Musicoin, "musicoin".parse().unwrap()); assert_eq!(SpecType::Ellaism, "ellaism".parse().unwrap()); assert_eq!(SpecType::Mix, "mix".parse().unwrap()); @@ -409,7 +403,6 @@ mod tests { assert_eq!(format!("{}", SpecType::Poanet), "poanet"); assert_eq!(format!("{}", SpecType::Volta), "volta"); assert_eq!(format!("{}", SpecType::Ewc), "energyweb"); - assert_eq!(format!("{}", SpecType::Expanse), "expanse"); assert_eq!(format!("{}", SpecType::Musicoin), "musicoin"); assert_eq!(format!("{}", SpecType::Ellaism), "ellaism"); assert_eq!(format!("{}", SpecType::Mix), "mix"); From 27a827b8e1114841d336bb70ef3220cd8b004f41 Mon Sep 17 00:00:00 2001 From: joshua-mir Date: Mon, 12 Aug 2019 15:54:59 +0200 Subject: [PATCH 2/4] remove whitespace --- parity/cli/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 6cca0e09cee..96e68056d34 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -301,7 +301,7 @@ usage! { ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(), "--chain=[CHAIN]", "Specify the blockchain type. CHAIN may be either a JSON chain specification file or ethereum, classic, poacore, volta, ewc, musicoin, ellaism, mix, callisto, morden, ropsten, kovan, rinkeby, goerli, kotti, poasokol, testnet, or dev.", - + ARG arg_keys_path: (String) = "$BASE/keys", or |c: &Config| c.parity.as_ref()?.keys_path.clone(), "--keys-path=[PATH]", "Specify the path for JSON key files to be found", From 909f8d28a7e90c13b4e5297f884a477ec1ed805b Mon Sep 17 00:00:00 2001 From: joshua-mir Date: Tue, 13 Aug 2019 12:14:37 +0200 Subject: [PATCH 3/4] remove whitespace (restart CI) --- parity/cli/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 96e68056d34..f847503a359 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -12,7 +12,7 @@ // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Parity Ethereum. If not, see . +// along with Parity Ethereum. If not, see . #[macro_use] mod usage; From a23f6362e8999f2217adaa7561b965ad9fbfef40 Mon Sep 17 00:00:00 2001 From: joshua-mir Date: Tue, 13 Aug 2019 12:15:16 +0200 Subject: [PATCH 4/4] (restart CI) --- parity/cli/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index f847503a359..96e68056d34 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -12,7 +12,7 @@ // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Parity Ethereum. If not, see . +// along with Parity Ethereum. If not, see . #[macro_use] mod usage;