forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-10 17:01:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

more rebase fixes

Browse source
This commit is contained in:
Guillaume Ballet 2026-04-22 17:07:56 +02:00
parent 26230d037f
commit 9b9143b14b
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trie/bintrie/store_commit.go
View file

@ -255,7 +255,7 @@ func (s *nodeStore) collectNodes(ref nodeRef, path []byte, flushfn nodeFlushFn,
} }
// Not at a group boundary - this shouldn't happen if we're called correctly from root // Not at a group boundary - this shouldn't happen if we're called correctly from root
// but handle it by continuing to traverse // but handle it by continuing to traverse
return s.collectChildGroups(path, flushfn, groupDepth, groupDepth-(int(node.depth)%groupDepth)-1) return s.collectChildGroups(node, path, flushfn, groupDepth, groupDepth-(int(node.depth)%groupDepth)-1)
case kindStem: case kindStem:
sn := s.getStem(ref.Index()) sn := s.getStem(ref.Index())
if !sn.dirty { if !sn.dirty {

4
trie/bintrie/trie.go
View file

@ -320,7 +320,7 @@ func (t *BinaryTrie) Commit(_ bool) (common.Hash, *trienode.NodeSet) {
pathBuf := make([]byte, 0, 32) pathBuf := make([]byte, 0, 32)
err := t.store.collectNodes(t.store.root, pathBuf, func(path []byte, hash common.Hash, serialized []byte) { err := t.store.collectNodes(t.store.root, pathBuf, func(path []byte, hash common.Hash, serialized []byte) {
nodeset.AddNode(path, trienode.NewNodeWithPrev(hash, serialized, t.tracer.Get(path))) nodeset.AddNode(path, trienode.NewNodeWithPrev(hash, serialized, t.tracer.Get(path)))
}) }, t.groupDepth)
if err != nil { if err != nil {
panic(fmt.Errorf("CollectNodes failed: %v", err)) panic(fmt.Errorf("CollectNodes failed: %v", err))
} }
@ -347,7 +347,7 @@ func (t *BinaryTrie) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {
// Copy creates a deep copy of the trie. // Copy creates a deep copy of the trie.
func (t *BinaryTrie) Copy() *BinaryTrie { func (t *BinaryTrie) Copy() *BinaryTrie {
return &BinaryTrie{ return &BinaryTrie{
root: t.root.Copy(), store: t.store.Copy(),
reader: t.reader, reader: t.reader,
tracer: t.tracer.Copy(), tracer: t.tracer.Copy(),
groupDepth: t.groupDepth, groupDepth: t.groupDepth,