Merge remote-tracking branch 'origin/master' into check-updates

parity/cli/config.full.toml

@@ -66,7 +66,7 @@ reseal_on_txs = "all"
 reseal_min_period = 4000
 work_queue_size = 20
 relay_set = "cheap"
-usd_per_tx = "0"
+usd_per_tx = "0.0025"
 usd_per_eth = "auto"
 price_update_period = "hourly"
 gas_floor_target = "4700000"

parity/cli/mod.rs

@@ -193,7 +193,7 @@ usage! {
 			or |c: &Config| otry!(c.mining).tx_time_limit.clone().map(Some),
 		flag_relay_set: String = "cheap",
 			or |c: &Config| otry!(c.mining).relay_set.clone(),
-		flag_usd_per_tx: String = "0",
+		flag_usd_per_tx: String = "0.0025",
 			or |c: &Config| otry!(c.mining).usd_per_tx.clone(),
 		flag_usd_per_eth: String = "auto",
 			or |c: &Config| otry!(c.mining).usd_per_eth.clone(),
@@ -577,7 +577,7 @@ mod tests {
 			flag_tx_gas_limit: Some("6283184".into()),
 			flag_tx_time_limit: Some(100u64),
 			flag_relay_set: "cheap".into(),
-			flag_usd_per_tx: "0".into(),
+			flag_usd_per_tx: "0.0025".into(),
 			flag_usd_per_eth: "auto".into(),
 			flag_price_update_period: "hourly".into(),
 			flag_gas_floor_target: "4700000".into(),

parity/cli/usage.txt

@@ -336,7 +336,7 @@ Miscellaneous Options:
   -l --logging LOGGING     Specify the logging level. Must conform to the same
                            format as RUST_LOG. (default: {flag_logging:?})
   --log-file FILENAME      Specify a filename into which logging should be
-                           directed. (default: {flag_log_file:?})
+                           appended. (default: {flag_log_file:?})
   --no-config              Don't load a configuration file.
   --no-color               Don't use terminal color codes in output. (default: {flag_no_color})
   -v --version             Show information about version.