diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-01 23:59:55 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-10-10 16:42:07 +0800 |
| commit | ff697e82dcfc94cc666f863d5093cfc23a11d98a (patch) | |
| tree | 5e89b3390e5feb5d57965376ef4266f18581e51d /miner | |
| parent | df64a9f5ef463f8b3d64076e663fda0eed2ef542 (diff) | |
| download | go-tangerine-ff697e82dcfc94cc666f863d5093cfc23a11d98a.tar go-tangerine-ff697e82dcfc94cc666f863d5093cfc23a11d98a.tar.gz go-tangerine-ff697e82dcfc94cc666f863d5093cfc23a11d98a.tar.bz2 go-tangerine-ff697e82dcfc94cc666f863d5093cfc23a11d98a.tar.lz go-tangerine-ff697e82dcfc94cc666f863d5093cfc23a11d98a.tar.xz go-tangerine-ff697e82dcfc94cc666f863d5093cfc23a11d98a.tar.zst go-tangerine-ff697e82dcfc94cc666f863d5093cfc23a11d98a.zip | |
[release/1.4.17] core, eth, internal, miner: optimize txpool for quick ops
(cherry picked from commit 0ef327bbee79c01a69ba59258acc6ce3a48bc288)
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/miner/worker.go b/miner/worker.go index be42fc67d..32f98bb67 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -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 ( |