[release/1.4.17] core, eth, internal, miner: optimize txpool for quick ops

(cherry picked from commit 0ef327bbee)
This commit is contained in:
Péter Szilágyi
2016-07-01 18:59:55 +03:00
committed by Felix Lange
parent df64a9f5ef
commit ff697e82dc
13 changed files with 812 additions and 452 deletions

View File

@ -501,8 +501,7 @@ func (self *worker) commitNewWork() {
*/
//approach 2
transactions := self.eth.TxPool().GetTransactions()
types.SortByPriceAndNonce(transactions)
transactions := types.SortByPriceAndNonce(self.eth.TxPool().Pending())
/* // approach 3
// commit transactions for this run.
@ -533,8 +532,8 @@ func (self *worker) commitNewWork() {
work.commitTransactions(self.mux, transactions, self.gasPrice, self.chain)
self.eth.TxPool().RemoveTransactions(work.lowGasTxs)
self.eth.TxPool().RemoveTransactions(work.failedTxs)
self.eth.TxPool().RemoveBatch(work.lowGasTxs)
self.eth.TxPool().RemoveBatch(work.failedTxs)
// compute uncles for the new block.
var (