forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: remove resolver

Browse source
This commit is contained in:
Marius van der Wijden 2023-11-15 14:36:40 +01:00
parent 62a32916ee
commit 08be7f116a
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
trie/sync_test.go
View file

@ -73,7 +73,7 @@ func makeTestTrie(scheme string) (ethdb.Database, *Database, *StateTrie, map[str
func checkTrieContents(t *testing.T, db ethdb.Database, scheme string, root []byte, content map[string][]byte, rawTrie bool) { func checkTrieContents(t *testing.T, db ethdb.Database, scheme string, root []byte, content map[string][]byte, rawTrie bool) {
// Check root availability and trie contents // Check root availability and trie contents
ndb := newTestDatabase(db, scheme) ndb := newTestDatabase(db, scheme)
if err := checkTrieConsistency(db, scheme, common.BytesToHash(root), rawTrie, nil); err != nil { if err := checkTrieConsistency(db, scheme, common.BytesToHash(root), rawTrie); err != nil {
t.Fatalf("inconsistent trie at %x: %v", root, err) t.Fatalf("inconsistent trie at %x: %v", root, err)
} }
type reader interface { type reader interface {
@ -101,7 +101,7 @@ func checkTrieContents(t *testing.T, db ethdb.Database, scheme string, root []by
} }
// checkTrieConsistency checks that all nodes in a trie are indeed present. // checkTrieConsistency checks that all nodes in a trie are indeed present.
func checkTrieConsistency(db ethdb.Database, scheme string, root common.Hash, rawTrie bool, resolver NodeResolver) error { func checkTrieConsistency(db ethdb.Database, scheme string, root common.Hash, rawTrie bool) error {
ndb := newTestDatabase(db, scheme) ndb := newTestDatabase(db, scheme)
var it NodeIterator var it NodeIterator
if rawTrie { if rawTrie {
@ -117,9 +117,6 @@ func checkTrieConsistency(db ethdb.Database, scheme string, root common.Hash, ra
} }
it = trie.MustNodeIterator(nil) it = trie.MustNodeIterator(nil)
} }
if resolver != nil {
it.AddResolver(resolver)
}
for it.Next(true) { for it.Next(true) {
} }
return it.Error() return it.Error()
@ -515,8 +512,8 @@ func testDuplicateAvoidanceSync(t *testing.T, scheme string) {
// Tests that at any point in time during a sync, only complete sub-tries are in // Tests that at any point in time during a sync, only complete sub-tries are in
// the database. // the database.
func TestIncompleteSyncHash(t *testing.T) { func TestIncompleteSyncHash(t *testing.T) {
testIncompleteSync(t, rawdb.HashScheme) // 9.585s testIncompleteSync(t, rawdb.HashScheme)
testIncompleteSync(t, rawdb.PathScheme) // 19.522 testIncompleteSync(t, rawdb.PathScheme)
} }
func testIncompleteSync(t *testing.T, scheme string) { func testIncompleteSync(t *testing.T, scheme string) {
@ -589,31 +586,16 @@ func testIncompleteSync(t *testing.T, scheme string) {
} }
} }
// Cache trie nodes for faster verification
nodesCache := make(map[string][]byte)
resolver := func(owner common.Hash, path []byte, hash common.Hash) []byte {
if scheme == rawdb.HashScheme {
return nodesCache[string(hash[:])]
}
return nodesCache[string(path)]
}
// Sanity check that removing any node from the database is detected // Sanity check that removing any node from the database is detected
for i, path := range addedKeys { for i, path := range addedKeys {
owner, inner := ResolvePath([]byte(path)) owner, inner := ResolvePath([]byte(path))
nodeHash := addedHashes[i] nodeHash := addedHashes[i]
value := rawdb.ReadTrieNode(diskdb, owner, inner, nodeHash, scheme) value := rawdb.ReadTrieNode(diskdb, owner, inner, nodeHash, scheme)
rawdb.DeleteTrieNode(diskdb, owner, inner, nodeHash, scheme) rawdb.DeleteTrieNode(diskdb, owner, inner, nodeHash, scheme)
if err := checkTrieConsistency(diskdb, srcDb.Scheme(), root, false, resolver); err == nil { if err := checkTrieConsistency(diskdb, srcDb.Scheme(), root, false); err == nil {
t.Fatalf("trie inconsistency not caught, missing: %x", path) t.Fatalf("trie inconsistency not caught, missing: %x", path)
} }
rawdb.WriteTrieNode(diskdb, owner, inner, nodeHash, value, scheme) rawdb.WriteTrieNode(diskdb, owner, inner, nodeHash, value, scheme)
// We only add nodes to the cache that we already visited
if scheme == rawdb.HashScheme {
nodesCache[string(nodeHash[:])] = value
} else {
nodesCache[string(inner[:])] = value
}
} }
} }