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

fix parity tests merge

Browse Source
This commit is contained in:
keorn 2016-11-30 12:58:45 +00:00
parent 95f81b2a2f
commit 4ef5badcea
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parity/cli/mod.rs
View File

@ -574,16 +574,11 @@ mod tests {
flag_gas_floor_target: "4700000".into(), flag_gas_floor_target: "4700000".into(),
flag_gas_cap: "6283184".into(), flag_gas_cap: "6283184".into(),
flag_extra_data: Some("Parity".into()), flag_extra_data: Some("Parity".into()),
<<<<<<< HEAD
flag_tx_queue_size: 2048usize,
flag_tx_queue_gas: "auto".into(),
=======
flag_tx_queue_size: 1024usize, flag_tx_queue_size: 1024usize,
flag_tx_queue_gas: "auto".into(), flag_tx_queue_gas: "auto".into(),
flag_tx_queue_strategy: "gas_factor".into(), flag_tx_queue_strategy: "gas_factor".into(),
flag_tx_queue_ban_count: 1u16, flag_tx_queue_ban_count: 1u16,
flag_tx_queue_ban_time: 180u16, flag_tx_queue_ban_time: 180u16,
>>>>>>> parity/master
flag_remove_solved: false, flag_remove_solved: false,
flag_notify_work: Some("http://localhost:3001".into()), flag_notify_work: Some("http://localhost:3001".into()),
@ -740,16 +735,11 @@ mod tests {
price_update_period: Some("hourly".into()), price_update_period: Some("hourly".into()),
gas_floor_target: None, gas_floor_target: None,
gas_cap: None, gas_cap: None,
<<<<<<< HEAD
tx_queue_size: Some(2048),
tx_queue_gas: Some("auto".into()),
=======
tx_queue_size: Some(1024), tx_queue_size: Some(1024),
tx_queue_gas: Some("auto".into()), tx_queue_gas: Some("auto".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,
>>>>>>> parity/master
tx_gas_limit: None, tx_gas_limit: None,
tx_time_limit: None, tx_time_limit: None,
extra_data: None, extra_data: None,