forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 19:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: simplify summary generation

Browse source
This commit is contained in:
lightclient 2026-02-17 21:14:52 +00:00
parent b4f7b076a5
commit 9b4495b9a8
No known key found for this signature in database
GPG key ID: 91289C7FE4ADADBD
1 changed files with 19 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
trie/inspect.go
View file

@ -19,6 +19,7 @@ package trie
import (
"bufio"
"bytes"
"cmp"
"container/heap"
"encoding/binary"
"encoding/json"
@ -464,64 +465,30 @@ func (t *topStorage) Sorted() []*storageSnapshot {
}
func compareStorageByDepth(a, b *storageSnapshot) int {
if cmp := compareInt(a.MaxDepth, b.MaxDepth); cmp != 0 {
return cmp
}
if cmp := compareUint64(a.TotalNodes, b.TotalNodes); cmp != 0 {
return cmp
}
if cmp := compareUint64(a.Summary.Value, b.Summary.Value); cmp != 0 {
return cmp
}
return bytes.Compare(a.Owner[:], b.Owner[:])
return cmp.Or(
cmp.Compare(a.MaxDepth, b.MaxDepth),
cmp.Compare(a.TotalNodes, b.TotalNodes),
cmp.Compare(a.Summary.Value, b.Summary.Value),
bytes.Compare(a.Owner[:], b.Owner[:]),
)
}
func compareStorageByTotal(a, b *storageSnapshot) int {
if cmp := compareUint64(a.TotalNodes, b.TotalNodes); cmp != 0 {
return cmp
}
if cmp := compareInt(a.MaxDepth, b.MaxDepth); cmp != 0 {
return cmp
}
if cmp := compareUint64(a.Summary.Value, b.Summary.Value); cmp != 0 {
return cmp
}
return bytes.Compare(a.Owner[:], b.Owner[:])
return cmp.Or(
cmp.Compare(a.TotalNodes, b.TotalNodes),
cmp.Compare(a.MaxDepth, b.MaxDepth),
cmp.Compare(a.Summary.Value, b.Summary.Value),
bytes.Compare(a.Owner[:], b.Owner[:]),
)
}
func compareStorageByValue(a, b *storageSnapshot) int {
if cmp := compareUint64(a.Summary.Value, b.Summary.Value); cmp != 0 {
return cmp
}
if cmp := compareInt(a.MaxDepth, b.MaxDepth); cmp != 0 {
return cmp
}
if cmp := compareUint64(a.TotalNodes, b.TotalNodes); cmp != 0 {
return cmp
}
return bytes.Compare(a.Owner[:], b.Owner[:])
}
func compareInt(a, b int) int {
switch {
case a > b:
return 1
case a < b:
return -1
default:
return 0
}
}
func compareUint64(a, b uint64) int {
switch {
case a > b:
return 1
case a < b:
return -1
default:
return 0
}
return cmp.Or(
cmp.Compare(a.Summary.Value, b.Summary.Value),
cmp.Compare(a.MaxDepth, b.MaxDepth),
cmp.Compare(a.TotalNodes, b.TotalNodes),
bytes.Compare(a.Owner[:], b.Owner[:]),
)
}
type inspectSummary struct {