From 18062f11dcde7ea303480cb766b2c534e6b0a781 Mon Sep 17 00:00:00 2001 From: Arkadiy Paronyan Date: Sat, 15 Oct 2016 12:29:27 +0200 Subject: [PATCH] Remove count limit for local transactions (#2634) --- ethcore/src/miner/transaction_queue.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs index c48f1d02c..030e46eb1 100644 --- a/ethcore/src/miner/transaction_queue.rs +++ b/ethcore/src/miner/transaction_queue.rs @@ -310,9 +310,9 @@ impl TransactionSet { let r = gas.overflowing_add(order.gas); if r.1 { return false } gas = r.0; - // Own and retracted transactions are allowed to go above the gas limit, bot not above the count limit. - (gas > self.gas_limit && order.origin != TransactionOrigin::Local && order.origin != TransactionOrigin::RetractedBlock) || - count > self.limit + // Own and retracted transactions are allowed to go above all limits. + order.origin != TransactionOrigin::Local && order.origin != TransactionOrigin::RetractedBlock && + (gas > self.gas_limit || count > self.limit) }) .map(|order| by_hash.get(&order.hash) .expect("All transactions in `self.by_priority` and `self.by_address` are kept in sync with `by_hash`."))