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

Enable --warp by default (#4719)

Browse Source 
* Enable --warp by default

* Disable warp if non-standard chain options are selected

* Add warnings if warp is specified

* Fixed tests
This commit is contained in:
Arkadiy Paronyan
2017-03-02 20:04:17 +01:00
committed by Gav Wood
parent eb37d26154
commit 591eb76a93
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
parity/cli/mod.rs
View File

@@ -119,8 +119,8 @@ usage! {
flag_ui_no_validation: bool = false, or |_| None,
// -- Networking Options
flag_warp: bool = false,
or |c: &Config| otry!(c.network).warp.clone(),
flag_no_warp: bool = false,
or |c: &Config| otry!(c.network).warp.clone().map(|w| !w),
flag_port: u16 = 30303u16,
or |c: &Config| otry!(c.network).port.clone(),
flag_min_peers: u16 = 25u16,
@@ -330,6 +330,7 @@ usage! {
// Values with optional default value.
flag_base_path: Option<String>, display dir::default_data_path(), or |c: &Config| otry!(c.parity).base_path.clone().map(Some),
flag_db_path: Option<String>, display dir::CHAINS_PATH, or |c: &Config| otry!(c.parity).db_path.clone().map(Some),
flag_warp: Option<bool>, display true, or |c: &Config| Some(otry!(c.network).warp.clone()),
}
}
@@ -638,7 +639,7 @@ mod tests {
flag_ui_no_validation: false,
// -- Networking Options
flag_warp: true,
flag_no_warp: false,
flag_port: 30303u16,
flag_min_peers: 25u16,
flag_max_peers: 50u16,
@@ -779,6 +780,7 @@ mod tests {
flag_etherbase: None,
flag_extradata: None,
flag_cache: None,
flag_warp: Some(true),
// -- Miscellaneous Options
flag_version: false,

3
parity/cli/usage.txt
View File

@@ -97,7 +97,7 @@ UI Options:
development. (default: {flag_ui_no_validation})
Networking Options:
--warp Enable syncing from the snapshot over the network. (default: {flag_warp})
--no-warp Disable syncing from the snapshot over the network. (default: {flag_no_warp})
--port PORT Override the port on which the node should listen
(default: {flag_port}).
--min-peers NUM Try to maintain at least NUM peers (default: {flag_min_peers}).
@@ -386,6 +386,7 @@ Legacy Options:
-w --webapp Does nothing; dapps server is on by default now.
--dapps-off Equivalent to --no-dapps.
--rpc Does nothing; JSON-RPC is on by default now.
--warp Does nothing; Warp sync is on by default. (default: {flag_warp})
--rpcaddr IP Equivalent to --jsonrpc-interface IP.
--rpcport PORT Equivalent to --jsonrpc-port PORT.
--rpcapi APIS Equivalent to --jsonrpc-apis APIS.