From f519111a5d2a4af9112f43bbf3aaaaae32a9d3ba Mon Sep 17 00:00:00 2001
From: dashangcun <907225865@qq.com>
Date: Thu, 9 Jan 2025 23:37:39 +0800
Subject: [PATCH] refactor: using slices.SortFunc to simplify the code

Signed-off-by: dashangcun <907225865@qq.com>
---
 cmd/devp2p/internal/ethtest/chain.go | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go
index 2a70e0328f..20b315fea2 100644
--- a/cmd/devp2p/internal/ethtest/chain.go
+++ b/cmd/devp2p/internal/ethtest/chain.go
@@ -28,7 +28,6 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
-	"sort"
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -166,11 +165,13 @@ func (c *Chain) RootAt(height int) common.Hash {
 // GetSender returns the address associated with account at the index in the
 // pre-funded accounts list.
 func (c *Chain) GetSender(idx int) (common.Address, uint64) {
-	var accounts Addresses
+	accounts := make([]common.Address, 0, len(c.senders))
 	for addr := range c.senders {
 		accounts = append(accounts, addr)
 	}
-	sort.Sort(accounts)
+	slices.SortFunc(accounts, func(a, b common.Address) int {
+		return bytes.Compare(a[:], b[:])
+	})
 	addr := accounts[idx]
 	return addr, c.senders[addr].Nonce
 }
@@ -260,22 +261,6 @@ func loadGenesis(genesisFile string) (core.Genesis, error) {
 	return gen, nil
 }
 
-type Addresses []common.Address
-
-func (a Addresses) Len() int {
-	return len(a)
-}
-
-func (a Addresses) Less(i, j int) bool {
-	return bytes.Compare(a[i][:], a[j][:]) < 0
-}
-
-func (a Addresses) Swap(i, j int) {
-	tmp := a[i]
-	a[i] = a[j]
-	a[j] = tmp
-}
-
 func blocksFromFile(chainfile string, gblock *types.Block) ([]*types.Block, error) {
 	// Load chain.rlp.
 	fh, err := os.Open(chainfile)