Skip to content

Commit b536156

Browse files
jyellickjyellick
committed
Upgrade libp2p (enables go 1.21 support)
This change is primarily intended to support go 1.21, but as a side-effect requires updating libp2p, which in turn triggers an update of golang.org/x/exp which creates quite a bit of (simple) churn in the slice sorting. This change introduces a new `cmp.Compare` function which can be used to return an integer satisfying the compare interface for slice sorting. In order to continue to support mplex for libp2p, the change references github.com/libp2p/go-libp2p-mplex instead. Please see the PR at libp2p/go-libp2p#2498 for the official usptream comment that indicates official support for mplex being moved to this location.
1 parent f794438 commit b536156

File tree

21 files changed

+123
-101
lines changed

21 files changed

+123
-101
lines changed

Diff for: ‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@v3
3333
- uses: actions/setup-go@v4
3434
with:
35-
go-version: '1.19'
35+
go-version: '1.20'
3636
- name: Install dependencies on Linux
3737
if: runner.os == 'Linux'
3838
run: sudo apt update && sudo apt install build-essential
@@ -84,7 +84,7 @@ jobs:
8484
- uses: actions/checkout@v3
8585
- uses: actions/setup-go@v4
8686
with:
87-
go-version: '1.19'
87+
go-version: '1.20'
8888

8989
- uses: actions/cache@v3
9090
with:

Diff for: ‎cmd/sentinel/sentinel/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/ledgerwatch/erigon/cl/clparams"
2222
"github.com/ledgerwatch/log/v3"
2323
"github.com/libp2p/go-libp2p"
24+
mplex "github.com/libp2p/go-libp2p-mplex"
2425
"github.com/libp2p/go-libp2p/core/crypto"
25-
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
2626
"github.com/libp2p/go-libp2p/p2p/security/noise"
2727
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
2828
"github.com/multiformats/go-multiaddr"

Diff for: ‎cmd/silkworm_api/snapshot_idx.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ package main
22

33
import (
44
"fmt"
5+
"os"
6+
"path/filepath"
7+
"time"
8+
59
"github.com/ledgerwatch/erigon-lib/common/background"
610
"github.com/ledgerwatch/erigon-lib/common/datadir"
711
"github.com/ledgerwatch/erigon-lib/downloader/snaptype"
@@ -12,9 +16,6 @@ import (
1216
"github.com/ledgerwatch/log/v3"
1317
"github.com/urfave/cli/v2"
1418
"golang.org/x/sync/errgroup"
15-
"os"
16-
"path/filepath"
17-
"time"
1819
)
1920

2021
// Build snapshot indexes for given snapshot files.
@@ -55,7 +56,7 @@ func FindIf(segments []snaptype.FileInfo, predicate func(snaptype.FileInfo) bool
5556
}
5657

5758
func buildIndex(cliCtx *cli.Context, dataDir string, snapshotPaths []string) error {
58-
logger, err := debug.Setup(cliCtx, true /* rootLogger */)
59+
logger, _, err := debug.Setup(cliCtx, true /* rootLogger */)
5960
if err != nil {
6061
return err
6162
}

Diff for: ‎core/blockchain.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
"github.com/ledgerwatch/erigon-lib/chain"
2929
libcommon "github.com/ledgerwatch/erigon-lib/common"
30+
"github.com/ledgerwatch/erigon-lib/common/cmp"
3031
"github.com/ledgerwatch/erigon-lib/common/fixedgas"
3132

3233
"github.com/ledgerwatch/erigon/common/math"
@@ -184,7 +185,7 @@ func ExecuteBlockEphemerally(
184185

185186
stateSyncReceipt := &types.Receipt{}
186187
if chainConfig.Consensus == chain.BorConsensus && len(blockLogs) > 0 {
187-
slices.SortStableFunc(blockLogs, func(i, j *types.Log) bool { return i.Index < j.Index })
188+
slices.SortStableFunc(blockLogs, func(i, j *types.Log) int { return cmp.Compare(i.Index, j.Index) })
188189

189190
if len(blockLogs) > len(logs) {
190191
stateSyncReceipt.Logs = blockLogs[len(logs):] // get state-sync logs from `state.Logs()`

Diff for: ‎erigon-lib/common/cmp/cmp.go

+11
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,14 @@ func Max[T constraints.Ordered](a, b T) T {
4444
}
4545
return b
4646
}
47+
48+
func Compare[T constraints.Ordered](a, b T) int {
49+
switch {
50+
case a < b:
51+
return -1
52+
case a == b:
53+
return 0
54+
default:
55+
return 1
56+
}
57+
}

Diff for: ‎erigon-lib/compress/compress.go

+17-12
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333

3434
"github.com/c2h5oh/datasize"
3535
"github.com/ledgerwatch/erigon-lib/common"
36+
"github.com/ledgerwatch/erigon-lib/common/cmp"
3637
dir2 "github.com/ledgerwatch/erigon-lib/common/dir"
3738
"github.com/ledgerwatch/erigon-lib/etl"
3839
"github.com/ledgerwatch/log/v3"
@@ -300,17 +301,17 @@ func (db *DictionaryBuilder) Less(i, j int) bool {
300301
return db.items[i].score < db.items[j].score
301302
}
302303

303-
func dictionaryBuilderLess(i, j *Pattern) bool {
304+
func dictionaryBuilderCmp(i, j *Pattern) int {
304305
if i.score == j.score {
305-
return bytes.Compare(i.word, j.word) < 0
306+
return bytes.Compare(i.word, j.word)
306307
}
307-
return i.score < j.score
308+
return cmp.Compare(i.score, j.score)
308309
}
309310

310311
func (db *DictionaryBuilder) Swap(i, j int) {
311312
db.items[i], db.items[j] = db.items[j], db.items[i]
312313
}
313-
func (db *DictionaryBuilder) Sort() { slices.SortFunc(db.items, dictionaryBuilderLess) }
314+
func (db *DictionaryBuilder) Sort() { slices.SortFunc(db.items, dictionaryBuilderCmp) }
314315

315316
func (db *DictionaryBuilder) Push(x interface{}) {
316317
db.items = append(db.items, x.(*Pattern))
@@ -383,11 +384,11 @@ type Pattern struct {
383384
type PatternList []*Pattern
384385

385386
func (pl PatternList) Len() int { return len(pl) }
386-
func patternListLess(i, j *Pattern) bool {
387+
func patternListCmp(i, j *Pattern) int {
387388
if i.uses == j.uses {
388-
return bits.Reverse64(i.code) < bits.Reverse64(j.code)
389+
return cmp.Compare(bits.Reverse64(i.code), bits.Reverse64(j.code))
389390
}
390-
return i.uses < j.uses
391+
return cmp.Compare(i.uses, j.uses)
391392
}
392393

393394
// PatternHuff is an intermediate node in a huffman tree of patterns
@@ -555,11 +556,11 @@ type PositionList []*Position
555556

556557
func (pl PositionList) Len() int { return len(pl) }
557558

558-
func positionListLess(i, j *Position) bool {
559+
func positionListCmp(i, j *Position) int {
559560
if i.uses == j.uses {
560-
return bits.Reverse64(i.code) < bits.Reverse64(j.code)
561+
return cmp.Compare(bits.Reverse64(i.code), bits.Reverse64(j.code))
561562
}
562-
return i.uses < j.uses
563+
return cmp.Compare(i.uses, j.uses)
563564
}
564565

565566
type PositionHeap []*PositionHuff
@@ -569,10 +570,14 @@ func (ph PositionHeap) Len() int {
569570
}
570571

571572
func (ph PositionHeap) Less(i, j int) bool {
573+
return ph.Compare(i, j) < 0
574+
}
575+
576+
func (ph PositionHeap) Compare(i, j int) int {
572577
if ph[i].uses == ph[j].uses {
573-
return ph[i].tieBreaker < ph[j].tieBreaker
578+
return cmp.Compare(ph[i].tieBreaker, ph[j].tieBreaker)
574579
}
575-
return ph[i].uses < ph[j].uses
580+
return cmp.Compare(ph[i].uses, ph[j].uses)
576581
}
577582

578583
func (ph *PositionHeap) Swap(i, j int) {

Diff for: ‎erigon-lib/compress/parallel_compress.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ func reducedict(ctx context.Context, trace bool, logPrefix, segmentFilePath stri
469469
distribution[len(p.word)]++
470470
}
471471
}
472-
slices.SortFunc(patternList, patternListLess)
472+
slices.SortFunc(patternList, patternListCmp)
473473
logCtx := make([]interface{}, 0, 8)
474474
logCtx = append(logCtx, "patternList.Len", patternList.Len())
475475

@@ -551,7 +551,7 @@ func reducedict(ctx context.Context, trace bool, logPrefix, segmentFilePath stri
551551
}
552552
//fmt.Printf("patternsSize = %d\n", patternsSize)
553553
// Write all the pattens
554-
slices.SortFunc(patternList, patternListLess)
554+
slices.SortFunc(patternList, patternListCmp)
555555
for _, p := range patternList {
556556
ns := binary.PutUvarint(numBuf[:], uint64(p.depth))
557557
if _, err = cw.Write(numBuf[:ns]); err != nil {
@@ -574,7 +574,7 @@ func reducedict(ctx context.Context, trace bool, logPrefix, segmentFilePath stri
574574
positionList = append(positionList, p)
575575
pos2code[pos] = p
576576
}
577-
slices.SortFunc(positionList, positionListLess)
577+
slices.SortFunc(positionList, positionListCmp)
578578
i = 0
579579
// Build Huffman tree for codes
580580
var posHeap PositionHeap
@@ -632,7 +632,7 @@ func reducedict(ctx context.Context, trace bool, logPrefix, segmentFilePath stri
632632
}
633633
//fmt.Printf("posSize = %d\n", posSize)
634634
// Write all the positions
635-
slices.SortFunc(positionList, positionListLess)
635+
slices.SortFunc(positionList, positionListCmp)
636636
for _, p := range positionList {
637637
ns := binary.PutUvarint(numBuf[:], uint64(p.depth))
638638
if _, err = cw.Write(numBuf[:ns]); err != nil {

Diff for: ‎erigon-lib/downloader/snaptype/files.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ import (
2020
"encoding/hex"
2121
"errors"
2222
"fmt"
23-
"github.com/anacrolix/torrent/metainfo"
2423
"os"
2524
"path/filepath"
2625
"strconv"
2726
"strings"
2827

28+
"github.com/anacrolix/torrent/metainfo"
29+
30+
"github.com/ledgerwatch/erigon-lib/common/cmp"
2931
"github.com/ledgerwatch/erigon-lib/common/dir"
3032
"golang.org/x/exp/slices"
3133
)
@@ -209,20 +211,20 @@ func ParseDir(dir string) (res []FileInfo, err error) {
209211
}
210212
res = append(res, meta)
211213
}
212-
slices.SortFunc(res, func(i, j FileInfo) bool {
214+
slices.SortFunc(res, func(i, j FileInfo) int {
213215
if i.Version != j.Version {
214-
return i.Version < j.Version
216+
return cmp.Compare(i.Version, j.Version)
215217
}
216218
if i.From != j.From {
217-
return i.From < j.From
219+
return cmp.Compare(i.From, j.From)
218220
}
219221
if i.To != j.To {
220-
return i.To < j.To
222+
return cmp.Compare(i.To, j.To)
221223
}
222224
if i.T != j.T {
223-
return i.T < j.T
225+
return cmp.Compare(i.T, j.T)
224226
}
225-
return i.Ext < j.Ext
227+
return cmp.Compare(i.Ext, j.Ext)
226228
})
227229

228230
return res, nil

Diff for: ‎erigon-lib/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/stretchr/testify v1.8.4
3434
github.com/tidwall/btree v1.6.0
3535
golang.org/x/crypto v0.13.0
36-
golang.org/x/exp v0.0.0-20230711023510-fffb14384f22
36+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
3737
golang.org/x/sync v0.3.0
3838
golang.org/x/sys v0.12.0
3939
golang.org/x/time v0.3.0
@@ -104,10 +104,10 @@ require (
104104
go.etcd.io/bbolt v1.3.6 // indirect
105105
go.opentelemetry.io/otel v1.8.0 // indirect
106106
go.opentelemetry.io/otel/trace v1.8.0 // indirect
107-
golang.org/x/mod v0.11.0 // indirect
108-
golang.org/x/net v0.12.0 // indirect
107+
golang.org/x/mod v0.12.0 // indirect
108+
golang.org/x/net v0.14.0 // indirect
109109
golang.org/x/text v0.13.0 // indirect
110-
golang.org/x/tools v0.7.0 // indirect
110+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
111111
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
112112
gopkg.in/yaml.v3 v3.0.1 // indirect
113113
modernc.org/libc v1.22.3 // indirect

Diff for: ‎erigon-lib/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU
425425
golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
426426
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
427427
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
428-
golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM=
429-
golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
428+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
429+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
430430
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
431431
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
432432
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -435,8 +435,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
435435
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
436436
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
437437
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
438-
golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
439-
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
438+
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
439+
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
440440
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
441441
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
442442
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -465,8 +465,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
465465
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
466466
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
467467
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
468-
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
469-
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
468+
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
469+
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
470470
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
471471
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
472472
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -545,8 +545,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
545545
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
546546
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
547547
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
548-
golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
549-
golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
548+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E=
549+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
550550
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
551551
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
552552
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

Diff for: ‎erigon-lib/gointerfaces/remote/sort.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"github.com/ledgerwatch/erigon-lib/gointerfaces/types"
77
)
88

9-
func NodeInfoReplyLess(i, j *types.NodeInfoReply) bool {
9+
func NodeInfoReplyCmp(i, j *types.NodeInfoReply) int {
1010
if cmp := strings.Compare(i.Name, j.Name); cmp != 0 {
11-
return cmp == -1
11+
return cmp
1212
}
13-
return strings.Compare(i.Enode, j.Enode) == -1
13+
return strings.Compare(i.Enode, j.Enode)
1414
}

Diff for: ‎erigon-lib/gointerfaces/remote/sort_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestSort(t *testing.T) {
4949
for _, tt := range tests {
5050
t.Run(tt.name, func(t *testing.T) {
5151

52-
slices.SortFunc(tt.got.NodesInfo, remote.NodeInfoReplyLess)
52+
slices.SortFunc(tt.got.NodesInfo, remote.NodeInfoReplyCmp)
5353
assert.Equal(t, tt.want, tt.got)
5454
})
5555
}

Diff for: ‎erigon-lib/patricia/patricia.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"math/bits"
2222
"strings"
2323

24+
"github.com/ledgerwatch/erigon-lib/common/cmp"
2425
"github.com/ledgerwatch/erigon-lib/sais"
2526
"golang.org/x/exp/slices"
2627
)
@@ -699,7 +700,7 @@ func (mf2 *MatchFinder2) FindLongestMatches(data []byte) []Match {
699700
return mf2.matches
700701
}
701702
//sort.Sort(&mf2.matches)
702-
slices.SortFunc(mf2.matches, func(i, j Match) bool { return i.Start < j.Start })
703+
slices.SortFunc(mf2.matches, func(i, j Match) int { return cmp.Compare(i.Start, j.Start) })
703704

704705
lastEnd := mf2.matches[0].End
705706
j := 1

Diff for: ‎eth/backend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ func (s *Ethereum) NodesInfo(limit int) (*remote.NodesInfoReply, error) {
10921092
}
10931093

10941094
nodesInfo := &remote.NodesInfoReply{NodesInfo: nodes}
1095-
slices.SortFunc(nodesInfo.NodesInfo, remote.NodeInfoReplyLess)
1095+
slices.SortFunc(nodesInfo.NodesInfo, remote.NodeInfoReplyCmp)
10961096

10971097
return nodesInfo, nil
10981098
}

Diff for: ‎eth/stagedsync/stage_interhashes.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ func (p *HashPromoter) Promote(logPrefix string, from, to uint64, storage bool,
347347
}
348348

349349
if !storage { // delete Intermediate hashes of deleted accounts
350-
slices.SortFunc(deletedAccounts, func(a, b []byte) bool { return bytes.Compare(a, b) < 0 })
350+
slices.SortFunc(deletedAccounts, bytes.Compare)
351351
for _, k := range deletedAccounts {
352352
if err := p.tx.ForPrefix(kv.TrieOfStorage, k, func(k, v []byte) error {
353353
if err := p.tx.Delete(kv.TrieOfStorage, k); err != nil {
@@ -445,7 +445,7 @@ func (p *HashPromoter) UnwindOnHistoryV3(logPrefix string, unwindFrom, unwindTo
445445
}
446446

447447
// delete Intermediate hashes of deleted accounts
448-
slices.SortFunc(deletedAccounts, func(a, b []byte) bool { return bytes.Compare(a, b) < 0 })
448+
slices.SortFunc(deletedAccounts, bytes.Compare)
449449
for _, k := range deletedAccounts {
450450
if err := p.tx.ForPrefix(kv.TrieOfStorage, k, func(k, v []byte) error {
451451
if err := p.tx.Delete(kv.TrieOfStorage, k); err != nil {
@@ -533,7 +533,7 @@ func (p *HashPromoter) Unwind(logPrefix string, s *StageState, u *UnwindState, s
533533
}
534534

535535
if !storage { // delete Intermediate hashes of deleted accounts
536-
slices.SortFunc(deletedAccounts, func(a, b []byte) bool { return bytes.Compare(a, b) < 0 })
536+
slices.SortFunc(deletedAccounts, bytes.Compare)
537537
for _, k := range deletedAccounts {
538538
if err := p.tx.ForPrefix(kv.TrieOfStorage, k, func(k, v []byte) error {
539539
if err := p.tx.Delete(kv.TrieOfStorage, k); err != nil {

0 commit comments

Comments
 (0)