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

Disable unsyncable expanse chain (#10926)

Browse Source 
* Only remove expanse from cli

* remove whitespace

* remove whitespace (restart CI)

* (restart CI)
This commit is contained in:
joshua-mir 2019-08-13 13:37:43 +02:00 committed by GitHub
parent 73f4564b66
commit e551122ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parity/cli/mod.rs
View File

@ -300,7 +300,7 @@ usage! {
ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(), ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(),
"--chain=[CHAIN]", "--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(), ARG arg_keys_path: (String) = "$BASE/keys", or |c: &Config| c.parity.as_ref()?.keys_path.clone(),
"--keys-path=[PATH]", "--keys-path=[PATH]",

7
parity/params.rs
View File

@ -36,7 +36,6 @@ pub enum SpecType {
Poanet, Poanet,
Volta, Volta,
Ewc, Ewc,
Expanse,
Musicoin, Musicoin,
Ellaism, Ellaism,
Mix, Mix,
@ -68,7 +67,6 @@ impl str::FromStr for SpecType {
"poanet" | "poacore" => SpecType::Poanet, "poanet" | "poacore" => SpecType::Poanet,
"volta" => SpecType::Volta, "volta" => SpecType::Volta,
"ewc" | "energyweb" => SpecType::Ewc, "ewc" | "energyweb" => SpecType::Ewc,
"expanse" => SpecType::Expanse,
"musicoin" => SpecType::Musicoin, "musicoin" => SpecType::Musicoin,
"ellaism" => SpecType::Ellaism, "ellaism" => SpecType::Ellaism,
"mix" => SpecType::Mix, "mix" => SpecType::Mix,
@ -95,7 +93,6 @@ impl fmt::Display for SpecType {
SpecType::Poanet => "poanet", SpecType::Poanet => "poanet",
SpecType::Volta => "volta", SpecType::Volta => "volta",
SpecType::Ewc => "energyweb", SpecType::Ewc => "energyweb",
SpecType::Expanse => "expanse",
SpecType::Musicoin => "musicoin", SpecType::Musicoin => "musicoin",
SpecType::Ellaism => "ellaism", SpecType::Ellaism => "ellaism",
SpecType::Mix => "mix", SpecType::Mix => "mix",
@ -122,7 +119,6 @@ impl SpecType {
SpecType::Poanet => Ok(spec::new_poanet(params)), SpecType::Poanet => Ok(spec::new_poanet(params)),
SpecType::Volta => Ok(spec::new_volta(params)), SpecType::Volta => Ok(spec::new_volta(params)),
SpecType::Ewc => Ok(spec::new_ewc(params)), SpecType::Ewc => Ok(spec::new_ewc(params)),
SpecType::Expanse => Ok(spec::new_expanse(params)),
SpecType::Musicoin => Ok(spec::new_musicoin(params)), SpecType::Musicoin => Ok(spec::new_musicoin(params)),
SpecType::Ellaism => Ok(spec::new_ellaism(params)), SpecType::Ellaism => Ok(spec::new_ellaism(params)),
SpecType::Mix => Ok(spec::new_mix(params)), SpecType::Mix => Ok(spec::new_mix(params)),
@ -145,7 +141,6 @@ impl SpecType {
pub fn legacy_fork_name(&self) -> Option<String> { pub fn legacy_fork_name(&self) -> Option<String> {
match *self { match *self {
SpecType::Classic => Some("classic".to_owned()), SpecType::Classic => Some("classic".to_owned()),
SpecType::Expanse => Some("expanse".to_owned()),
SpecType::Musicoin => Some("musicoin".to_owned()), SpecType::Musicoin => Some("musicoin".to_owned()),
_ => None, _ => None,
} }
@ -379,7 +374,6 @@ mod tests {
assert_eq!(SpecType::Volta, "volta".parse().unwrap()); assert_eq!(SpecType::Volta, "volta".parse().unwrap());
assert_eq!(SpecType::Ewc, "ewc".parse().unwrap()); assert_eq!(SpecType::Ewc, "ewc".parse().unwrap());
assert_eq!(SpecType::Ewc, "energyweb".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::Musicoin, "musicoin".parse().unwrap());
assert_eq!(SpecType::Ellaism, "ellaism".parse().unwrap()); assert_eq!(SpecType::Ellaism, "ellaism".parse().unwrap());
assert_eq!(SpecType::Mix, "mix".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::Poanet), "poanet");
assert_eq!(format!("{}", SpecType::Volta), "volta"); assert_eq!(format!("{}", SpecType::Volta), "volta");
assert_eq!(format!("{}", SpecType::Ewc), "energyweb"); assert_eq!(format!("{}", SpecType::Ewc), "energyweb");
assert_eq!(format!("{}", SpecType::Expanse), "expanse");
assert_eq!(format!("{}", SpecType::Musicoin), "musicoin"); assert_eq!(format!("{}", SpecType::Musicoin), "musicoin");
assert_eq!(format!("{}", SpecType::Ellaism), "ellaism"); assert_eq!(format!("{}", SpecType::Ellaism), "ellaism");
assert_eq!(format!("{}", SpecType::Mix), "mix"); assert_eq!(format!("{}", SpecType::Mix), "mix");