internal/ethapi, les: use slices package for sorting (#27492)

Co-authored-by: Felix Lange <fjl@twurst.com>
This commit is contained in:
Dan Laine 2023-06-19 05:33:48 -04:00 committed by GitHub
parent a848212709
commit 87e510d963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 56 deletions

View File

@ -17,7 +17,6 @@
package ethapi
import (
"bytes"
"context"
"crypto/ecdsa"
"encoding/json"
@ -25,7 +24,6 @@ import (
"hash"
"math/big"
"reflect"
"sort"
"testing"
"time"
@ -48,6 +46,7 @@ import (
"github.com/ethereum/go-ethereum/rpc"
"github.com/stretchr/testify/require"
"golang.org/x/crypto/sha3"
"golang.org/x/exp/slices"
)
func TestTransaction_RoundTripRpcJSON(t *testing.T) {
@ -649,19 +648,13 @@ type Account struct {
addr common.Address
}
type Accounts []Account
func (a Accounts) Len() int { return len(a) }
func (a Accounts) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func (a Accounts) Less(i, j int) bool { return bytes.Compare(a[i].addr.Bytes(), a[j].addr.Bytes()) < 0 }
func newAccounts(n int) (accounts Accounts) {
func newAccounts(n int) (accounts []Account) {
for i := 0; i < n; i++ {
key, _ := crypto.GenerateKey()
addr := crypto.PubkeyToAddress(key.PublicKey)
accounts = append(accounts, Account{key: key, addr: addr})
}
sort.Sort(accounts)
slices.SortFunc(accounts, func(a, b Account) bool { return a.addr.Less(b.addr) })
return accounts
}

View File

@ -17,12 +17,12 @@
package les
import (
"sort"
"sync"
"sync/atomic"
"github.com/ethereum/go-ethereum/common/mclock"
"github.com/ethereum/go-ethereum/common/prque"
"golang.org/x/exp/slices"
)
// servingQueue allows running tasks in a limited number of threads and puts the
@ -180,35 +180,19 @@ func (sq *servingQueue) threadController() {
}
}
type (
// peerTasks lists the tasks received from a given peer when selecting peers to freeze
peerTasks struct {
// peerTasks lists the tasks received from a given peer when selecting peers to freeze
type peerTasks struct {
peer *clientPeer
list []*servingTask
sumTime uint64
priority float64
}
// peerList is a sortable list of peerTasks
peerList []*peerTasks
)
func (l peerList) Len() int {
return len(l)
}
func (l peerList) Less(i, j int) bool {
return l[i].priority < l[j].priority
}
func (l peerList) Swap(i, j int) {
l[i], l[j] = l[j], l[i]
}
// freezePeers selects the peers with the worst priority queued tasks and freezes
// them until burstTime goes under burstDropLimit or all peers are frozen
func (sq *servingQueue) freezePeers() {
peerMap := make(map[*clientPeer]*peerTasks)
var peerList peerList
var peerList []*peerTasks
if sq.best != nil {
sq.queue.Push(sq.best, sq.best.priority)
}
@ -231,7 +215,9 @@ func (sq *servingQueue) freezePeers() {
tasks.list = append(tasks.list, task)
tasks.sumTime += task.expTime
}
sort.Sort(peerList)
slices.SortFunc(peerList, func(a, b *peerTasks) bool {
return a.priority < b.priority
})
drop := true
for _, tasks := range peerList {
if drop {

View File

@ -17,10 +17,10 @@
package utils
import (
"sort"
"sync"
"github.com/ethereum/go-ethereum/p2p/enode"
"golang.org/x/exp/slices"
)
const maxSelectionWeight = 1000000000 // maximum selection weight of each individual node/address group
@ -340,24 +340,9 @@ func (l *Limiter) Stop() {
l.cond.Signal()
}
type (
dropList []dropListItem
dropListItem struct {
type dropListItem struct {
nq *nodeQueue
priority float64
}
)
func (l dropList) Len() int {
return len(l)
}
func (l dropList) Less(i, j int) bool {
return l[i].priority < l[j].priority
}
func (l dropList) Swap(i, j int) {
l[i], l[j] = l[j], l[i]
}
// dropRequests selects the nodes with the highest queued request cost to selection
@ -366,7 +351,7 @@ func (l dropList) Swap(i, j int) {
func (l *Limiter) dropRequests() {
var (
sumValue float64
list dropList
list []dropListItem
)
for _, nq := range l.nodes {
sumValue += nq.value
@ -384,7 +369,9 @@ func (l *Limiter) dropRequests() {
priority: w / float64(nq.sumCost),
})
}
sort.Sort(list)
slices.SortFunc(list, func(a, b dropListItem) bool {
return a.priority < b.priority
})
for _, item := range list {
for _, request := range item.nq.queue {
close(request.process)