diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt index 89603d311..3e3e79247 100644 --- a/parity/cli/usage.txt +++ b/parity/cli/usage.txt @@ -32,7 +32,7 @@ Operating Options: (default: {flag_mode_alarm}). --chain CHAIN Specify the blockchain type. CHAIN may be either a JSON chain specification file or olympic, frontier, - homestead, mainnet, morden, classic, expanse, + homestead, mainnet, morden, ropsten, classic, expanse, testnet or dev (default: {flag_chain}). -d --db-path PATH Specify the database & configuration directory path (default: {flag_db_path}). diff --git a/parity/configuration.rs b/parity/configuration.rs index 61063aa18..5188b44f1 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -313,7 +313,7 @@ impl Configuration { fn chain(&self) -> String { if self.args.flag_testnet { - "morden".to_owned() + "ropsten".to_owned() } else { self.args.flag_chain.clone() } @@ -905,7 +905,7 @@ mod tests { // then assert_eq!(conf.network_settings(), NetworkSettings { name: "testname".to_owned(), - chain: "morden".to_owned(), + chain: "ropsten".to_owned(), network_port: 30303, rpc_enabled: true, rpc_interface: "local".to_owned(),