From dbccc700f1ad5c40307fc52c6d511a8684b0b19f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Wed, 18 Jul 2018 10:58:14 +0200 Subject: [PATCH] Remove unused tx_queue_gas parameter. (#9153) --- parity/cli/mod.rs | 7 ------- parity/cli/tests/config.full.toml | 1 - parity/cli/tests/config.toml | 1 - 3 files changed, 9 deletions(-) diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 2179344f7..d67da3db7 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -720,10 +720,6 @@ usage! { "--tx-queue-per-sender=[LIMIT]", "Maximum number of transactions per sender in the queue. By default it's 1% of the entire queue, but not less than 16.", - ARG arg_tx_queue_gas: (String) = "off", or |c: &Config| c.mining.as_ref()?.tx_queue_gas.clone(), - "--tx-queue-gas=[LIMIT]", - "Maximum amount of total gas for external transactions in the queue. LIMIT can be either an amount of gas or 'auto' or 'off'. 'auto' sets the limit to be 20x the current block gas limit.", - ARG arg_tx_queue_strategy: (String) = "gas_price", or |c: &Config| c.mining.as_ref()?.tx_queue_strategy.clone(), "--tx-queue-strategy=[S]", "Prioritization strategy used to order transactions in the queue. S may be: gas_price - Prioritize txs with high gas price", @@ -1303,7 +1299,6 @@ struct Mining { tx_queue_size: Option, tx_queue_per_sender: Option, tx_queue_mem_limit: Option, - tx_queue_gas: Option, tx_queue_strategy: Option, tx_queue_ban_count: Option, tx_queue_ban_time: Option, @@ -1729,7 +1724,6 @@ mod tests { arg_tx_queue_size: 8192usize, arg_tx_queue_per_sender: None, arg_tx_queue_mem_limit: 4u32, - arg_tx_queue_gas: "off".into(), arg_tx_queue_strategy: "gas_factor".into(), arg_tx_queue_ban_count: Some(1u16), arg_tx_queue_ban_time: Some(180u16), @@ -1991,7 +1985,6 @@ mod tests { tx_queue_size: Some(8192), tx_queue_per_sender: None, tx_queue_mem_limit: None, - tx_queue_gas: Some("off".into()), tx_queue_strategy: None, tx_queue_ban_count: None, tx_queue_ban_time: None, diff --git a/parity/cli/tests/config.full.toml b/parity/cli/tests/config.full.toml index 0c1efb184..2dcba6f19 100644 --- a/parity/cli/tests/config.full.toml +++ b/parity/cli/tests/config.full.toml @@ -128,7 +128,6 @@ price_update_period = "hourly" gas_floor_target = "4700000" gas_cap = "6283184" tx_queue_size = 8192 -tx_queue_gas = "off" tx_queue_strategy = "gas_factor" tx_queue_ban_count = 1 tx_queue_ban_time = 180 #s diff --git a/parity/cli/tests/config.toml b/parity/cli/tests/config.toml index 245935de1..9fffe4cb0 100644 --- a/parity/cli/tests/config.toml +++ b/parity/cli/tests/config.toml @@ -57,7 +57,6 @@ reseal_min_period = 4000 reseal_max_period = 60000 price_update_period = "hourly" tx_queue_size = 8192 -tx_queue_gas = "off" [footprint] tracing = "on"