diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-01-22 18:05:17 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-01-22 18:33:34 +0800 |
| commit | a2dc074b1ddffaf4e35758835bafe14cca5f0ea7 (patch) | |
| tree | b9aa5c904aea0962eb7c103896b6a4ef4c32971c /miner | |
| parent | 78f196409552466ff878a030e4069495a923c73e (diff) | |
| download | dexon-a2dc074b1ddffaf4e35758835bafe14cca5f0ea7.tar dexon-a2dc074b1ddffaf4e35758835bafe14cca5f0ea7.tar.gz dexon-a2dc074b1ddffaf4e35758835bafe14cca5f0ea7.tar.bz2 dexon-a2dc074b1ddffaf4e35758835bafe14cca5f0ea7.tar.lz dexon-a2dc074b1ddffaf4e35758835bafe14cca5f0ea7.tar.xz dexon-a2dc074b1ddffaf4e35758835bafe14cca5f0ea7.tar.zst dexon-a2dc074b1ddffaf4e35758835bafe14cca5f0ea7.zip | |
core, core/types, miner: fix transaction nonce-price combo sort
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/miner/worker.go b/miner/worker.go index 1a411ae20..9c29d2250 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -19,7 +19,6 @@ package miner import ( "fmt" "math/big" - "sort" "sync" "sync/atomic" "time" @@ -496,12 +495,12 @@ func (self *worker) commitNewWork() { /* //approach 1 transactions := self.eth.TxPool().GetTransactions() - sort.Sort(types.TxByNonce{transactions}) + sort.Sort(types.TxByNonce(transactions)) */ //approach 2 transactions := self.eth.TxPool().GetTransactions() - sort.Sort(types.TxByPriceAndNonce{transactions}) + types.SortByPriceAndNonce(transactions) /* // approach 3 // commit transactions for this run. @@ -525,8 +524,8 @@ func (self *worker) commitNewWork() { multiTxOwner = append(multiTxOwner, txs...) } } - sort.Sort(types.TxByPrice{singleTxOwner}) - sort.Sort(types.TxByNonce{multiTxOwner}) + sort.Sort(types.TxByPrice(singleTxOwner)) + sort.Sort(types.TxByNonce(multiTxOwner)) transactions := append(singleTxOwner, multiTxOwner...) */ |