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

reuse Morden for Classic Testnet

Browse Source
This commit is contained in:
Igor Artamonov
2016-12-12 19:50:32 +00:00
parent 6742b080f5
commit e61d14d7f7
6 changed files with 13 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parity/cli/usage.txt
View File

@@ -33,7 +33,7 @@ Operating Options:
--chain CHAIN Specify the blockchain type. CHAIN may be either a
JSON chain specification file or olympic, frontier,
homestead, mainnet, morden, ropsten, classic, expanse,
testnet, classic-morden or dev (default: {flag_chain}).
testnet or dev (default: {flag_chain}).
-d --db-path PATH Specify the database & configuration directory path
(default: {flag_db_path}).
--keys-path PATH Specify the path for JSON key files to be found

8
parity/params.rs
View File

@@ -31,7 +31,6 @@ pub enum SpecType {
Ropsten,
Olympic,
Classic,
ClassicTestnet,
Expanse,
Dev,
Custom(String),
@@ -50,8 +49,7 @@ impl str::FromStr for SpecType {
let spec = match s {
"frontier" | "homestead" | "mainnet" => SpecType::Mainnet,
"frontier-dogmatic" | "homestead-dogmatic" | "classic" => SpecType::Classic,
"classic-testnet" | "classic-morden" => SpecType::ClassicTestnet,
"morden" | "testnet" => SpecType::Testnet,
"morden" | "testnet" | "classic-testnet" => SpecType::Testnet,
"ropsten" => SpecType::Ropsten,
"olympic" => SpecType::Olympic,
"expanse" => SpecType::Expanse,
@@ -70,7 +68,6 @@ impl SpecType {
SpecType::Ropsten => Ok(ethereum::new_ropsten()),
SpecType::Olympic => Ok(ethereum::new_olympic()),
SpecType::Classic => Ok(ethereum::new_classic()),
SpecType::ClassicTestnet => Ok(ethereum::new_classic_morden()),
SpecType::Expanse => Ok(ethereum::new_expanse()),
SpecType::Dev => Ok(Spec::new_instant()),
SpecType::Custom(ref filename) => {
@@ -292,8 +289,7 @@ mod tests {
assert_eq!(SpecType::Ropsten, "ropsten".parse().unwrap());
assert_eq!(SpecType::Olympic, "olympic".parse().unwrap());
assert_eq!(SpecType::Classic, "classic".parse().unwrap());
assert_eq!(SpecType::ClassicTestnet, "classic-testnet".parse().unwrap());
assert_eq!(SpecType::ClassicTestnet, "classic-morden".parse().unwrap());
assert_eq!(SpecType::Testnet, "classic-testnet".parse().unwrap());
}
#[test]