diff --git a/parity/cli/presets/config.dev-insecure.toml b/parity/cli/presets/config.dev-insecure.toml new file mode 100644 index 000000000..3a9956f8e --- /dev/null +++ b/parity/cli/presets/config.dev-insecure.toml @@ -0,0 +1,16 @@ +[parity] +no_consensus = true +chain = "dev" + +[mining] +reseal_min_period = 0 +min_gas_price = 0 + +[rpc] +interface = "all" +apis = ["all"] +hosts = ["all"] + +[ipfs] +enable = false # this is the default +hosts = ["all"] \ No newline at end of file diff --git a/parity/cli/presets/config.insecure.toml b/parity/cli/presets/config.insecure.toml new file mode 100644 index 000000000..6e67db3d7 --- /dev/null +++ b/parity/cli/presets/config.insecure.toml @@ -0,0 +1,11 @@ +[parity] +no_consensus = true + +[rpc] +interface = "all" +apis = ["all"] +hosts = ["all"] + +[ipfs] +enable = false # this is the default +hosts = ["all"] \ No newline at end of file diff --git a/parity/cli/presets/config.mining.toml b/parity/cli/presets/config.mining.toml index f059fe30e..52e004942 100644 --- a/parity/cli/presets/config.mining.toml +++ b/parity/cli/presets/config.mining.toml @@ -1,6 +1,3 @@ -# This config should be placed in following path: -# $HOME/Library/Application Support/io.parity.ethereum/config.toml - [network] # Parity will try to maintain connection to at least 50 peers. min_peers = 50 diff --git a/parity/cli/presets/config.non-standard-ports.toml b/parity/cli/presets/config.non-standard-ports.toml index 9c826f36e..e4013ff94 100644 --- a/parity/cli/presets/config.non-standard-ports.toml +++ b/parity/cli/presets/config.non-standard-ports.toml @@ -1,6 +1,3 @@ -# This config should be placed in following path: -# $HOME/Library/Application Support/io.parity.ethereum/config.toml - [network] # Parity will listen for connections on port 30305. port = 30305 diff --git a/parity/cli/presets/mod.rs b/parity/cli/presets/mod.rs index 4fe29174c..4333f1256 100644 --- a/parity/cli/presets/mod.rs +++ b/parity/cli/presets/mod.rs @@ -19,6 +19,8 @@ pub fn preset_config_string(arg: &str) -> Result<&'static str, &str> { "dev" => Ok(include_str!("./config.dev.toml")), "mining" => Ok(include_str!("./config.mining.toml")), "non-standard-ports" => Ok(include_str!("./config.non-standard-ports.toml")), + "insecure" => Ok(include_str!("./config.insecure.toml")), + "dev-insecure" => Ok(include_str!("./config.dev-insecure.toml")), _ => Err(arg.clone()) } } \ No newline at end of file diff --git a/parity/configuration.rs b/parity/configuration.rs index aec46cc6b..0883d417b 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -1587,6 +1587,7 @@ mod tests { let conf = Configuration::parse(&args, None).unwrap(); match conf.into_command().unwrap().cmd { Cmd::Run(c) => { + assert_eq!(c.net_settings.chain, "dev"); assert_eq!(c.gas_pricer, GasPricerConfig::Fixed(0.into())); assert_eq!(c.miner_options.reseal_min_period, Duration::from_millis(0)); }, @@ -1629,6 +1630,49 @@ mod tests { } } + #[test] + fn test_insecure_preset() { + let args = vec!["parity", "preset", "insecure"]; + let conf = Configuration::parse(&args, None).unwrap(); + match conf.into_command().unwrap().cmd { + Cmd::Run(c) => { + assert_eq!(c.update_policy.require_consensus, false); + assert_eq!(c.net_settings.rpc_interface, "0.0.0.0"); + match c.http_conf.apis { + ApiSet::List(set) => assert_eq!(set, ApiSet::All.list_apis()), + _ => panic!("Incorrect rpc apis"), + } + // "web3,eth,net,personal,parity,parity_set,traces,rpc,parity_accounts"); + assert_eq!(c.http_conf.hosts, None); + assert_eq!(c.ipfs_conf.hosts, None); + }, + _ => panic!("Should be Cmd::Run"), + } + } + + #[test] + fn test_dev_insecure_preset() { + let args = vec!["parity", "preset", "dev-insecure"]; + let conf = Configuration::parse(&args, None).unwrap(); + match conf.into_command().unwrap().cmd { + Cmd::Run(c) => { + assert_eq!(c.net_settings.chain, "dev"); + assert_eq!(c.gas_pricer, GasPricerConfig::Fixed(0.into())); + assert_eq!(c.miner_options.reseal_min_period, Duration::from_millis(0)); + assert_eq!(c.update_policy.require_consensus, false); + assert_eq!(c.net_settings.rpc_interface, "0.0.0.0"); + match c.http_conf.apis { + ApiSet::List(set) => assert_eq!(set, ApiSet::All.list_apis()), + _ => panic!("Incorrect rpc apis"), + } + // "web3,eth,net,personal,parity,parity_set,traces,rpc,parity_accounts"); + assert_eq!(c.http_conf.hosts, None); + assert_eq!(c.ipfs_conf.hosts, None); + }, + _ => panic!("Should be Cmd::Run"), + } + } + #[test] fn test_override_preset() { let args = vec!["parity", "preset", "mining", "--min-peers=99"];