From a2dc074b1ddffaf4e35758835bafe14cca5f0ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 22 Jan 2016 12:05:17 +0200 Subject: core, core/types, miner: fix transaction nonce-price combo sort --- miner/worker.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'miner/worker.go') 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...) */ -- cgit v1.2.3