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

Remove unused tx_queue_gas parameter. (#9153)

Browse Source
This commit is contained in:
Tomasz Drwięga 2018-07-18 10:58:14 +02:00 committed by Niklas Adolfsson
parent 9f90ff2e59
commit dbccc700f1
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
parity/cli/mod.rs
View File

@ -720,10 +720,6 @@ usage! {
"--tx-queue-per-sender=[LIMIT]", "--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.", "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(), ARG arg_tx_queue_strategy: (String) = "gas_price", or |c: &Config| c.mining.as_ref()?.tx_queue_strategy.clone(),
"--tx-queue-strategy=[S]", "--tx-queue-strategy=[S]",
"Prioritization strategy used to order transactions in the queue. S may be: gas_price - Prioritize txs with high gas price", "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<usize>, tx_queue_size: Option<usize>,
tx_queue_per_sender: Option<usize>, tx_queue_per_sender: Option<usize>,
tx_queue_mem_limit: Option<u32>, tx_queue_mem_limit: Option<u32>,
tx_queue_gas: Option<String>,
tx_queue_strategy: Option<String>, tx_queue_strategy: Option<String>,
tx_queue_ban_count: Option<u16>, tx_queue_ban_count: Option<u16>,
tx_queue_ban_time: Option<u16>, tx_queue_ban_time: Option<u16>,
@ -1729,7 +1724,6 @@ mod tests {
arg_tx_queue_size: 8192usize, arg_tx_queue_size: 8192usize,
arg_tx_queue_per_sender: None, arg_tx_queue_per_sender: None,
arg_tx_queue_mem_limit: 4u32, arg_tx_queue_mem_limit: 4u32,
arg_tx_queue_gas: "off".into(),
arg_tx_queue_strategy: "gas_factor".into(), arg_tx_queue_strategy: "gas_factor".into(),
arg_tx_queue_ban_count: Some(1u16), arg_tx_queue_ban_count: Some(1u16),
arg_tx_queue_ban_time: Some(180u16), arg_tx_queue_ban_time: Some(180u16),
@ -1991,7 +1985,6 @@ mod tests {
tx_queue_size: Some(8192), tx_queue_size: Some(8192),
tx_queue_per_sender: None, tx_queue_per_sender: None,
tx_queue_mem_limit: None, tx_queue_mem_limit: None,
tx_queue_gas: Some("off".into()),
tx_queue_strategy: None, tx_queue_strategy: None,
tx_queue_ban_count: None, tx_queue_ban_count: None,
tx_queue_ban_time: None, tx_queue_ban_time: None,

1
parity/cli/tests/config.full.toml
View File

@ -128,7 +128,6 @@ price_update_period = "hourly"
gas_floor_target = "4700000" gas_floor_target = "4700000"
gas_cap = "6283184" gas_cap = "6283184"
tx_queue_size = 8192 tx_queue_size = 8192
tx_queue_gas = "off"
tx_queue_strategy = "gas_factor" tx_queue_strategy = "gas_factor"
tx_queue_ban_count = 1 tx_queue_ban_count = 1
tx_queue_ban_time = 180 #s tx_queue_ban_time = 180 #s

1
parity/cli/tests/config.toml
View File

@ -57,7 +57,6 @@ reseal_min_period = 4000
reseal_max_period = 60000 reseal_max_period = 60000
price_update_period = "hourly" price_update_period = "hourly"
tx_queue_size = 8192 tx_queue_size = 8192
tx_queue_gas = "off"
[footprint] [footprint]
tracing = "on" tracing = "on"