diff --git a/accounts/abi/abigen/bindv2.go b/accounts/abi/abigen/bindv2.go index ef4b769bb4..223c8879d8 100644 --- a/accounts/abi/abigen/bindv2.go +++ b/accounts/abi/abigen/bindv2.go @@ -23,7 +23,6 @@ import ( "reflect" "regexp" "slices" - "sort" "strings" "text/template" "unicode" @@ -280,7 +279,7 @@ func iterSorted[V any](inp map[string]V, onItem func(string, V) error) error { for key := range inp { sortedKeys = append(sortedKeys, key) } - sort.Strings(sortedKeys) + slices.Sort(sortedKeys) for _, key := range sortedKeys { if err := onItem(key, inp[key]); err != nil { diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go index d7725fadb1..f0154aaac8 100644 --- a/cmd/devp2p/nodesetcmd.go +++ b/cmd/devp2p/nodesetcmd.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" "net/netip" - "sort" + "slices" "strconv" "strings" "time" @@ -90,7 +90,7 @@ func showAttributeCounts(ns nodeSet) { maxlength = len(key) } } - sort.Strings(keys) + slices.Sort(keys) fmt.Println("ENR attribute counts:") for _, key := range keys { fmt.Printf("%s%s: %d\n", strings.Repeat(" ", maxlength-len(key)+1), key, attrcount[key]) diff --git a/console/console.go b/console/console.go index b5c77bd78f..47f996ab14 100644 --- a/console/console.go +++ b/console/console.go @@ -24,7 +24,7 @@ import ( "os/signal" "path/filepath" "regexp" - "sort" + "slices" "strings" "sync" "syscall" @@ -314,7 +314,7 @@ func (c *Console) Welcome() { for api, version := range apis { modules = append(modules, fmt.Sprintf("%s:%s", api, version)) } - sort.Strings(modules) + slices.Sort(modules) message += " modules: " + strings.Join(modules, " ") + "\n" } message += "\nTo exit, press ctrl-d or type exit" diff --git a/core/stateless/stats.go b/core/stateless/stats.go index 94f5587f99..072424667e 100644 --- a/core/stateless/stats.go +++ b/core/stateless/stats.go @@ -20,7 +20,6 @@ import ( "encoding/json" "maps" "slices" - "sort" "strconv" "strings" @@ -56,7 +55,7 @@ func NewWitnessStats() *WitnessStats { func (s *WitnessStats) Add(nodes map[string][]byte, owner common.Hash) { // Extract paths from the nodes map paths := slices.Collect(maps.Keys(nodes)) - sort.Strings(paths) + slices.Sort(paths) for i, path := range paths { // If current path is a prefix of the next path, it's not a leaf. diff --git a/core/vm/eips.go b/core/vm/eips.go index d7ed18648e..7d7b790849 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -19,7 +19,7 @@ package vm import ( "fmt" "math" - "sort" + "slices" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/tracing" @@ -65,7 +65,7 @@ func ActivateableEips() []string { for k := range activators { nums = append(nums, fmt.Sprintf("%d", k)) } - sort.Strings(nums) + slices.Sort(nums) return nums } diff --git a/eth/fetcher/tx_fetcher.go b/eth/fetcher/tx_fetcher.go index d919ac8a5f..3c9e9fa234 100644 --- a/eth/fetcher/tx_fetcher.go +++ b/eth/fetcher/tx_fetcher.go @@ -21,6 +21,7 @@ import ( "fmt" "math" mrand "math/rand" + "slices" "sort" "time" @@ -975,7 +976,7 @@ func (f *TxFetcher) forEachPeer(peers map[string]struct{}, do func(peer string)) for peer := range peers { list = append(list, peer) } - sort.Strings(list) + slices.Sort(list) rotateStrings(list, f.rand.Intn(len(list))) for _, peer := range list { do(peer) diff --git a/ethdb/dbtest/testsuite.go b/ethdb/dbtest/testsuite.go index 862ddabb6a..ff552e2395 100644 --- a/ethdb/dbtest/testsuite.go +++ b/ethdb/dbtest/testsuite.go @@ -20,7 +20,6 @@ import ( "bytes" "crypto/rand" "slices" - "sort" "strconv" "testing" @@ -135,7 +134,7 @@ func TestDatabaseSuite(t *testing.T, New func() ethdb.KeyValueStore) { defer db.Close() keys := []string{"1", "2", "3", "4", "6", "10", "11", "12", "20", "21", "22"} - sort.Strings(keys) // 1, 10, 11, etc + slices.Sort(keys) // 1, 10, 11, etc for _, k := range keys { if err := db.Put([]byte(k), nil); err != nil { @@ -904,7 +903,7 @@ func iterateKeys(it ethdb.Iterator) []string { for it.Next() { keys = append(keys, string(it.Key())) } - sort.Strings(keys) + slices.Sort(keys) it.Release() return keys } diff --git a/ethdb/memorydb/memorydb.go b/ethdb/memorydb/memorydb.go index 200ad60245..b7d5eb92bc 100644 --- a/ethdb/memorydb/memorydb.go +++ b/ethdb/memorydb/memorydb.go @@ -20,7 +20,7 @@ package memorydb import ( "bytes" "errors" - "sort" + "slices" "strings" "sync" @@ -184,7 +184,7 @@ func (db *Database) NewIterator(prefix []byte, start []byte) ethdb.Iterator { } } // Sort the items and retrieve the associated values - sort.Strings(keys) + slices.Sort(keys) for _, key := range keys { values = append(values, db.db[key]) } diff --git a/internal/build/file.go b/internal/build/file.go index 2cd090c42c..7d7a1d03a0 100644 --- a/internal/build/file.go +++ b/internal/build/file.go @@ -21,7 +21,7 @@ import ( "io" "os" "path/filepath" - "sort" + "slices" "strings" ) @@ -71,6 +71,6 @@ func DiffHashes(a map[string][32]byte, b map[string][32]byte) []string { updates = append(updates, file) } } - sort.Strings(updates) + slices.Sort(updates) return updates } diff --git a/internal/flags/helpers.go b/internal/flags/helpers.go index fc84ae85da..e8822bd3f8 100644 --- a/internal/flags/helpers.go +++ b/internal/flags/helpers.go @@ -20,7 +20,7 @@ import ( "fmt" "os" "regexp" - "sort" + "slices" "strings" "github.com/ethereum/go-ethereum/internal/version" @@ -277,7 +277,7 @@ func CheckEnvVars(ctx *cli.Context, flags []cli.Flag, prefix string) { } } keyvals := os.Environ() - sort.Strings(keyvals) + slices.Sort(keyvals) for _, keyval := range keyvals { key := strings.Split(keyval, "=")[0] diff --git a/internal/jsre/completion.go b/internal/jsre/completion.go index 844a0532fd..f589b5a8f6 100644 --- a/internal/jsre/completion.go +++ b/internal/jsre/completion.go @@ -18,7 +18,7 @@ package jsre import ( "regexp" - "sort" + "slices" "strings" "github.com/dop251/goja" @@ -88,6 +88,6 @@ func getCompletions(vm *goja.Runtime, line string) (results []string) { } } - sort.Strings(results) + slices.Sort(results) return results } diff --git a/internal/jsre/pretty.go b/internal/jsre/pretty.go index bd772b4927..e5eb4680d1 100644 --- a/internal/jsre/pretty.go +++ b/internal/jsre/pretty.go @@ -20,7 +20,7 @@ import ( "fmt" "io" "reflect" - "sort" + "slices" "strconv" "strings" @@ -221,8 +221,8 @@ func (ctx ppctx) fields(obj *goja.Object) []string { } } iterOwnAndConstructorKeys(ctx.vm, obj, add) - sort.Strings(vals) - sort.Strings(methods) + slices.Sort(vals) + slices.Sort(methods) return append(vals, methods...) } diff --git a/metrics/prometheus/collector.go b/metrics/prometheus/collector.go index 31b8c51b65..ec742ea469 100644 --- a/metrics/prometheus/collector.go +++ b/metrics/prometheus/collector.go @@ -19,7 +19,7 @@ package prometheus import ( "bytes" "fmt" - "sort" + "slices" "strconv" "strings" @@ -144,7 +144,7 @@ func (c *collector) writeGaugeInfo(name string, value metrics.GaugeInfoValue) { for k, v := range value { kvs = append(kvs, fmt.Sprintf("%v=%q", k, v)) } - sort.Strings(kvs) + slices.Sort(kvs) c.buff.WriteString(fmt.Sprintf("{%v} 1\n\n", strings.Join(kvs, ", "))) } diff --git a/metrics/prometheus/prometheus.go b/metrics/prometheus/prometheus.go index dbdeae6c7f..0dc90bb5f7 100644 --- a/metrics/prometheus/prometheus.go +++ b/metrics/prometheus/prometheus.go @@ -20,7 +20,7 @@ package prometheus import ( "fmt" "net/http" - "sort" + "slices" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" @@ -34,7 +34,7 @@ func Handler(reg metrics.Registry) http.Handler { reg.Each(func(name string, i interface{}) { names = append(names, name) }) - sort.Strings(names) + slices.Sort(names) // Aggregate all the metrics into a Prometheus collector c := newCollector() diff --git a/metrics/registry.go b/metrics/registry.go index 6070f3d0e9..36bdeb8c7f 100644 --- a/metrics/registry.go +++ b/metrics/registry.go @@ -3,7 +3,7 @@ package metrics import ( "errors" "fmt" - "sort" + "slices" "strings" "sync" ) @@ -54,7 +54,7 @@ func (r *orderedRegistry) Each(f func(string, interface{})) { for name := range reg { names = append(names, name) } - sort.Strings(names) + slices.Sort(names) for _, name := range names { f(name, reg[name]) } diff --git a/node/rpcstack.go b/node/rpcstack.go index a1cc832f9f..f2c2ce441d 100644 --- a/node/rpcstack.go +++ b/node/rpcstack.go @@ -24,7 +24,7 @@ import ( "io" "net" "net/http" - "sort" + "slices" "strconv" "strings" "sync" @@ -182,7 +182,7 @@ func (h *httpServer) start() error { for path := range h.handlerNames { paths = append(paths, path) } - sort.Strings(paths) + slices.Sort(paths) logged := make(map[string]bool, len(paths)) for _, path := range paths { name := h.handlerNames[path] diff --git a/rlp/rlpgen/gen.go b/rlp/rlpgen/gen.go index 64841b38a0..8e5f40be52 100644 --- a/rlp/rlpgen/gen.go +++ b/rlp/rlpgen/gen.go @@ -21,7 +21,7 @@ import ( "fmt" "go/format" "go/types" - "sort" + "slices" "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" "golang.org/x/tools/go/packages" @@ -194,7 +194,7 @@ func (ctx *genContext) importsList() []string { imp = append(imp, fmt.Sprintf("%s %q", p.alias, path)) } } - sort.Strings(imp) + slices.Sort(imp) return imp } diff --git a/signer/core/apitypes/types.go b/signer/core/apitypes/types.go index 9034e7e9ca..85915afbea 100644 --- a/signer/core/apitypes/types.go +++ b/signer/core/apitypes/types.go @@ -26,7 +26,6 @@ import ( "reflect" "regexp" "slices" - "sort" "strconv" "strings" @@ -417,7 +416,7 @@ func (typedData *TypedData) EncodeType(primaryType string) hexutil.Bytes { deps := typedData.Dependencies(primaryType, []string{}) if len(deps) > 0 { slicedDeps := deps[1:] - sort.Strings(slicedDeps) + slices.Sort(slicedDeps) deps = append([]string{primaryType}, slicedDeps...) } diff --git a/tests/init.go b/tests/init.go index 705e929ae9..b490679315 100644 --- a/tests/init.go +++ b/tests/init.go @@ -19,7 +19,7 @@ package tests import ( "fmt" "math/big" - "sort" + "slices" "github.com/ethereum/go-ethereum/params" ) @@ -740,7 +740,7 @@ func AvailableForks() []string { for k := range Forks { availableForks = append(availableForks, k) } - sort.Strings(availableForks) + slices.Sort(availableForks) return availableForks } diff --git a/tests/init_test.go b/tests/init_test.go index b933c9808c..13c07c0632 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -26,7 +26,7 @@ import ( "reflect" "regexp" "runtime" - "sort" + "slices" "strings" "testing" @@ -269,7 +269,7 @@ func sortedMapKeys(m reflect.Value) []string { for i, k := range m.MapKeys() { keys[i] = k.String() } - sort.Strings(keys) + slices.Sort(keys) return keys } diff --git a/trie/trie_test.go b/trie/trie_test.go index b8b8edb33e..e1c886a3b7 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -25,6 +25,7 @@ import ( "io" "math/rand" "reflect" + "slices" "sort" "strings" "testing" @@ -1309,7 +1310,7 @@ func printSet(set *trienode.NodeSet) string { for k := range set.Nodes { paths = append(paths, k) } - sort.Strings(paths) + slices.Sort(paths) for _, path := range paths { n := set.Nodes[path]