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

Merge pull request #3551 from ethcore/ropsten

Browse Source 
--testnet set to ropsten
This commit is contained in:
Gav Wood 2016-11-22 00:03:11 +01:00 committed by GitHub
commit 7e5553a872
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parity/cli/usage.txt
View File

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

4
parity/configuration.rs
View File

@ -313,7 +313,7 @@ impl Configuration {
fn chain(&self) -> String { fn chain(&self) -> String {
if self.args.flag_testnet { if self.args.flag_testnet {
"morden".to_owned() "ropsten".to_owned()
} else { } else {
self.args.flag_chain.clone() self.args.flag_chain.clone()
} }
@ -905,7 +905,7 @@ mod tests {
// then // then
assert_eq!(conf.network_settings(), NetworkSettings { assert_eq!(conf.network_settings(), NetworkSettings {
name: "testname".to_owned(), name: "testname".to_owned(),
chain: "morden".to_owned(), chain: "ropsten".to_owned(),
network_port: 30303, network_port: 30303,
rpc_enabled: true, rpc_enabled: true,
rpc_interface: "local".to_owned(), rpc_interface: "local".to_owned(),