From a9391f91f705acd976113fa3d38098f88df6b825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 6 Oct 2016 10:20:05 +0200 Subject: [PATCH] Increase size of transaction queue by default --- ethcore/src/miner/miner.rs | 2 +- parity/cli/config.full.toml | 2 +- parity/cli/mod.rs | 4 ++-- parity/configuration.rs | 2 +- parity/params.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs index 77183d452..38fc199cd 100644 --- a/ethcore/src/miner/miner.rs +++ b/ethcore/src/miner/miner.rs @@ -81,7 +81,7 @@ impl Default for MinerOptions { reseal_on_external_tx: false, reseal_on_own_tx: true, tx_gas_limit: !U256::zero(), - tx_queue_size: 1024, + tx_queue_size: 2048, pending_set: PendingSet::AlwaysQueue, reseal_min_period: Duration::from_secs(2), work_queue_size: 20, diff --git a/parity/cli/config.full.toml b/parity/cli/config.full.toml index a411e6767..5b47e1184 100644 --- a/parity/cli/config.full.toml +++ b/parity/cli/config.full.toml @@ -67,7 +67,7 @@ usd_per_eth = "auto" price_update_period = "hourly" gas_floor_target = "4700000" gas_cap = "6283184" -tx_queue_size = 1024 +tx_queue_size = 2048 tx_gas_limit = "6283184" extra_data = "Parity" remove_solved = false diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 082dbe8e4..8044032eb 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -193,7 +193,7 @@ usage! { or |c: &Config| otry!(c.mining).gas_cap.clone(), flag_extra_data: Option = None, or |c: &Config| otry!(c.mining).extra_data.clone().map(Some), - flag_tx_queue_size: usize = 1024usize, + flag_tx_queue_size: usize = 2048usize, or |c: &Config| otry!(c.mining).tx_queue_size.clone(), flag_remove_solved: bool = false, or |c: &Config| otry!(c.mining).remove_solved.clone(), @@ -522,7 +522,7 @@ mod tests { flag_gas_floor_target: "4700000".into(), flag_gas_cap: "6283184".into(), flag_extra_data: Some("Parity".into()), - flag_tx_queue_size: 1024usize, + flag_tx_queue_size: 2048usize, flag_remove_solved: false, flag_notify_work: Some("http://localhost:3001".into()), diff --git a/parity/configuration.rs b/parity/configuration.rs index 811ba6097..4503b0f2f 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -125,7 +125,7 @@ impl Configuration { ImportFromGethAccounts { to: dirs.keys, testnet: self.args.flag_testnet - } + } ); Cmd::Account(account_cmd) } else if self.args.cmd_wallet { diff --git a/parity/params.rs b/parity/params.rs index faba029b2..ee3038ebf 100644 --- a/parity/params.rs +++ b/parity/params.rs @@ -206,7 +206,7 @@ impl Default for MinerExtras { extra_data: version_data(), gas_floor_target: U256::from(4_700_000), gas_ceil_target: U256::from(6_283_184), - transactions_limit: 1024, + transactions_limit: 2048, } } }