diff options
author | Péter Szilágyi <peterke@gmail.com> | 2017-10-25 17:18:44 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-25 17:18:44 +0800 |
commit | 0095531a58772b1f5bd1547169790dbde84ec78a (patch) | |
tree | 91b9e56dbcb9afe4058c0f41f33ebc7812201abc /core/tx_list.go | |
parent | ca376ead88a5a26626a90abdb62f4de7f6313822 (diff) | |
download | dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar.gz dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar.bz2 dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar.lz dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar.xz dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar.zst dexon-0095531a58772b1f5bd1547169790dbde84ec78a.zip |
core, eth, les: fix messy code (#15367)
* core, eth, les: fix messy code
* les: fixed tx status test and rlp encoding
* core: add a workaround for light sync
Diffstat (limited to 'core/tx_list.go')
-rw-r--r-- | core/tx_list.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/tx_list.go b/core/tx_list.go index 94721aa5f..2935929d7 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -384,13 +384,13 @@ func (h *priceHeap) Pop() interface{} { // txPricedList is a price-sorted heap to allow operating on transactions pool // contents in a price-incrementing way. type txPricedList struct { - all *map[common.Hash]txLookupRec // Pointer to the map of all transactions - items *priceHeap // Heap of prices of all the stored transactions - stales int // Number of stale price points to (re-heap trigger) + all *map[common.Hash]*types.Transaction // Pointer to the map of all transactions + items *priceHeap // Heap of prices of all the stored transactions + stales int // Number of stale price points to (re-heap trigger) } // newTxPricedList creates a new price-sorted transaction heap. -func newTxPricedList(all *map[common.Hash]txLookupRec) *txPricedList { +func newTxPricedList(all *map[common.Hash]*types.Transaction) *txPricedList { return &txPricedList{ all: all, items: new(priceHeap), @@ -416,7 +416,7 @@ func (l *txPricedList) Removed() { l.stales, l.items = 0, &reheap for _, tx := range *l.all { - *l.items = append(*l.items, tx.tx) + *l.items = append(*l.items, tx) } heap.Init(l.items) } |