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

saturating add

Browse Source 
Conflicts:
	ethcore/src/miner/transaction_queue.rs
This commit is contained in:
Tomasz Drwięga 2016-09-23 19:42:53 +02:00
parent 06fc494d03
commit 97fcd60e56
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ethcore/src/miner/transaction_queue.rs
View File

@ -156,11 +156,7 @@ impl TransactionOrder {
} }
fn penalize(mut self) -> Self { fn penalize(mut self) -> Self {
let current = self.penalties; self.penalties = self.penalties.saturating_add(1);
self.penalties = match self.penalties.saturating_add(1) {
(_, true) => current,
(val, false) => val,
};
self self
} }
} }
@ -404,7 +400,7 @@ pub struct AccountDetails {
} }
/// Transactions with `gas > (gas_limit + gas_limit * Factor(in percents))` are not imported to the queue. /// Transactions with `gas > (gas_limit + gas_limit * Factor(in percents))` are not imported to the queue.
const GAS_LIMIT_HYSTERESIS: usize = 10; // % const GAS_LIMIT_HYSTERESIS: usize = 10; // (100/GAS_LIMIT_HYSTERESIS) %
/// `TransactionQueue` implementation /// `TransactionQueue` implementation
pub struct TransactionQueue { pub struct TransactionQueue {