From d305e3f5cbcdd2e2d7a7c89e52263ed6c25813c8 Mon Sep 17 00:00:00 2001
From: Darioush Jalali <darioush.jalali@avalabs.org>
Date: Tue, 23 Jan 2024 13:10:25 -0800
Subject: [PATCH] move trie generation helper out of trie/ (#1053)
* remove ethdb
* refactor: move AllowUnfinalizedQueries out of vm.Config
* move trie generation helper out of trie/ (#359)
---
sync/client/client_test.go | 7 +++--
sync/handlers/leafs_request_test.go | 15 ++++++----
sync/statesync/sync_test.go | 43 ++++++++++++++++-----------
sync/statesync/test_sync.go | 15 +++++-----
{trie => sync/syncutils}/test_trie.go | 39 +++++++++++-------------
trie/triedb/hashdb/database.go | 15 ++++++----
6 files changed, 75 insertions(+), 59 deletions(-)
rename {trie => sync/syncutils}/test_trie.go (84%)
diff --git a/sync/client/client_test.go b/sync/client/client_test.go
index 251e6bb276..0e78bf8fa4 100644
--- a/sync/client/client_test.go
+++ b/sync/client/client_test.go
@@ -24,6 +24,7 @@ import (
clientstats "github.com/ava-labs/subnet-evm/sync/client/stats"
"github.com/ava-labs/subnet-evm/sync/handlers"
handlerstats "github.com/ava-labs/subnet-evm/sync/handlers/stats"
+ "github.com/ava-labs/subnet-evm/sync/syncutils"
"github.com/ava-labs/subnet-evm/trie"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
@@ -410,8 +411,8 @@ func TestGetLeafs(t *testing.T) {
const leafsLimit = 1024
trieDB := trie.NewDatabase(rawdb.NewMemoryDatabase())
- largeTrieRoot, largeTrieKeys, _ := trie.GenerateTrie(t, trieDB, 100_000, common.HashLength)
- smallTrieRoot, _, _ := trie.GenerateTrie(t, trieDB, leafsLimit, common.HashLength)
+ largeTrieRoot, largeTrieKeys, _ := syncutils.GenerateTrie(t, trieDB, 100_000, common.HashLength)
+ smallTrieRoot, _, _ := syncutils.GenerateTrie(t, trieDB, leafsLimit, common.HashLength)
handler := handlers.NewLeafsRequestHandler(trieDB, nil, message.Codec, handlerstats.NewNoopHandlerStats())
client := NewClient(&ClientConfig{
@@ -781,7 +782,7 @@ func TestGetLeafsRetries(t *testing.T) {
rand.Seed(1)
trieDB := trie.NewDatabase(rawdb.NewMemoryDatabase())
- root, _, _ := trie.GenerateTrie(t, trieDB, 100_000, common.HashLength)
+ root, _, _ := syncutils.GenerateTrie(t, trieDB, 100_000, common.HashLength)
handler := handlers.NewLeafsRequestHandler(trieDB, nil, message.Codec, handlerstats.NewNoopHandlerStats())
mockNetClient := &mockNetwork{}
diff --git a/sync/handlers/leafs_request_test.go b/sync/handlers/leafs_request_test.go
index 860fbfdc21..c2b8c33aae 100644
--- a/sync/handlers/leafs_request_test.go
+++ b/sync/handlers/leafs_request_test.go
@@ -15,6 +15,7 @@ import (
"github.com/ava-labs/subnet-evm/core/types"
"github.com/ava-labs/subnet-evm/plugin/evm/message"
"github.com/ava-labs/subnet-evm/sync/handlers/stats"
+ "github.com/ava-labs/subnet-evm/sync/syncutils"
"github.com/ava-labs/subnet-evm/trie"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
@@ -29,13 +30,17 @@ func TestLeafsRequestHandler_OnLeafsRequest(t *testing.T) {
memdb := rawdb.NewMemoryDatabase()
trieDB := trie.NewDatabase(memdb)
- corruptedTrieRoot, _, _ := trie.GenerateTrie(t, trieDB, 100, common.HashLength)
+ corruptedTrieRoot, _, _ := syncutils.GenerateTrie(t, trieDB, 100, common.HashLength)
+ tr, err := trie.New(trie.TrieID(corruptedTrieRoot), trieDB)
+ if err != nil {
+ t.Fatal(err)
+ }
// Corrupt [corruptedTrieRoot]
- trie.CorruptTrie(t, trieDB, corruptedTrieRoot, 5)
+ syncutils.CorruptTrie(t, memdb, tr, 5)
- largeTrieRoot, largeTrieKeys, _ := trie.GenerateTrie(t, trieDB, 10_000, common.HashLength)
- smallTrieRoot, _, _ := trie.GenerateTrie(t, trieDB, 500, common.HashLength)
- accountTrieRoot, accounts := trie.FillAccounts(
+ largeTrieRoot, largeTrieKeys, _ := syncutils.GenerateTrie(t, trieDB, 10_000, common.HashLength)
+ smallTrieRoot, _, _ := syncutils.GenerateTrie(t, trieDB, 500, common.HashLength)
+ accountTrieRoot, accounts := syncutils.FillAccounts(
t,
trieDB,
common.Hash{},
diff --git a/sync/statesync/sync_test.go b/sync/statesync/sync_test.go
index e8e04195ed..7e7845e6e6 100644
--- a/sync/statesync/sync_test.go
+++ b/sync/statesync/sync_test.go
@@ -20,6 +20,7 @@ import (
statesyncclient "github.com/ava-labs/subnet-evm/sync/client"
"github.com/ava-labs/subnet-evm/sync/handlers"
handlerstats "github.com/ava-labs/subnet-evm/sync/handlers/stats"
+ "github.com/ava-labs/subnet-evm/sync/syncutils"
"github.com/ava-labs/subnet-evm/trie"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
@@ -120,7 +121,7 @@ func TestSimpleSyncCases(t *testing.T) {
prepareForTest: func(t *testing.T) (ethdb.Database, ethdb.Database, *trie.Database, common.Hash) {
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- root, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, numAccounts, nil)
+ root, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, numAccounts, nil)
return rawdb.NewMemoryDatabase(), serverDB, serverTrieDB, root
},
},
@@ -128,7 +129,7 @@ func TestSimpleSyncCases(t *testing.T) {
prepareForTest: func(t *testing.T) (ethdb.Database, ethdb.Database, *trie.Database, common.Hash) {
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- root, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, numAccounts, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
+ root, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, numAccounts, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
if index%3 == 0 {
codeBytes := make([]byte, 256)
_, err := rand.Read(codeBytes)
@@ -157,9 +158,9 @@ func TestSimpleSyncCases(t *testing.T) {
prepareForTest: func(t *testing.T) (ethdb.Database, ethdb.Database, *trie.Database, common.Hash) {
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- root, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, numAccounts, func(t *testing.T, i int, account types.StateAccount) types.StateAccount {
+ root, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, numAccounts, func(t *testing.T, i int, account types.StateAccount) types.StateAccount {
if i%5 == 0 {
- account.Root, _, _ = trie.GenerateTrie(t, serverTrieDB, 16, common.HashLength)
+ account.Root, _, _ = syncutils.GenerateTrie(t, serverTrieDB, 16, common.HashLength)
}
return account
@@ -179,7 +180,7 @@ func TestSimpleSyncCases(t *testing.T) {
prepareForTest: func(t *testing.T) (ethdb.Database, ethdb.Database, *trie.Database, common.Hash) {
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- root, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, numAccountsSmall, nil)
+ root, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, numAccountsSmall, nil)
return rawdb.NewMemoryDatabase(), serverDB, serverTrieDB, root
},
GetLeafsIntercept: func(_ message.LeafsRequest, _ message.LeafsResponse) (message.LeafsResponse, error) {
@@ -279,8 +280,8 @@ func TestResumeSyncLargeStorageTrieInterrupted(t *testing.T) {
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- largeStorageRoot, _, _ := trie.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
- root, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, 2000, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
+ largeStorageRoot, _, _ := syncutils.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
+ root, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, 2000, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
// Set the root for a single account
if index == 10 {
account.Root = largeStorageRoot
@@ -311,16 +312,16 @@ func TestResumeSyncToNewRootAfterLargeStorageTrieInterrupted(t *testing.T) {
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- largeStorageRoot1, _, _ := trie.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
- largeStorageRoot2, _, _ := trie.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
- root1, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, 2000, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
+ largeStorageRoot1, _, _ := syncutils.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
+ largeStorageRoot2, _, _ := syncutils.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
+ root1, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, 2000, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
// Set the root for a single account
if index == 10 {
account.Root = largeStorageRoot1
}
return account
})
- root2, _ := trie.FillAccounts(t, serverTrieDB, root1, 100, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
+ root2, _ := syncutils.FillAccounts(t, serverTrieDB, root1, 100, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
if index == 20 {
account.Root = largeStorageRoot2
}
@@ -352,8 +353,8 @@ func TestResumeSyncLargeStorageTrieWithConsecutiveDuplicatesInterrupted(t *testi
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- largeStorageRoot, _, _ := trie.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
- root, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, 100, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
+ largeStorageRoot, _, _ := syncutils.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
+ root, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, 100, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
// Set the root for 2 successive accounts
if index == 10 || index == 11 {
account.Root = largeStorageRoot
@@ -384,8 +385,8 @@ func TestResumeSyncLargeStorageTrieWithSpreadOutDuplicatesInterrupted(t *testing
serverDB := rawdb.NewMemoryDatabase()
serverTrieDB := trie.NewDatabase(serverDB)
- largeStorageRoot, _, _ := trie.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
- root, _ := trie.FillAccounts(t, serverTrieDB, common.Hash{}, 100, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
+ largeStorageRoot, _, _ := syncutils.GenerateTrie(t, serverTrieDB, 2000, common.HashLength)
+ root, _ := syncutils.FillAccounts(t, serverTrieDB, common.Hash{}, 100, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
if index == 10 || index == 90 {
account.Root = largeStorageRoot
}
@@ -464,7 +465,11 @@ func TestResyncNewRootAfterDeletes(t *testing.T) {
continue
}
corruptedStorageRoots[acc.Root] = struct{}{}
- trie.CorruptTrie(t, clientTrieDB, acc.Root, 2)
+ tr, err := trie.New(trie.TrieID(acc.Root), clientTrieDB)
+ if err != nil {
+ t.Fatal(err)
+ }
+ syncutils.CorruptTrie(t, clientDB, tr, 2)
}
if err := it.Err; err != nil {
t.Fatal(err)
@@ -474,7 +479,11 @@ func TestResyncNewRootAfterDeletes(t *testing.T) {
"delete intermediate account trie nodes": {
deleteBetweenSyncs: func(t *testing.T, root common.Hash, clientDB ethdb.Database) {
clientTrieDB := trie.NewDatabase(clientDB)
- trie.CorruptTrie(t, clientTrieDB, root, 5)
+ tr, err := trie.New(trie.TrieID(root), clientTrieDB)
+ if err != nil {
+ t.Fatal(err)
+ }
+ syncutils.CorruptTrie(t, clientDB, tr, 5)
},
},
} {
diff --git a/sync/statesync/test_sync.go b/sync/statesync/test_sync.go
index 2d43589851..f606e7e9df 100644
--- a/sync/statesync/test_sync.go
+++ b/sync/statesync/test_sync.go
@@ -12,6 +12,7 @@ import (
"github.com/ava-labs/subnet-evm/core/rawdb"
"github.com/ava-labs/subnet-evm/core/state/snapshot"
"github.com/ava-labs/subnet-evm/core/types"
+ "github.com/ava-labs/subnet-evm/sync/syncutils"
"github.com/ava-labs/subnet-evm/trie"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
@@ -38,7 +39,7 @@ func assertDBConsistency(t testing.TB, root common.Hash, clientDB ethdb.Database
}
trieAccountLeaves := 0
- trie.AssertTrieConsistency(t, root, serverTrieDB, clientTrieDB, func(key, val []byte) error {
+ syncutils.AssertTrieConsistency(t, root, serverTrieDB, clientTrieDB, func(key, val []byte) error {
trieAccountLeaves++
accHash := common.BytesToHash(key)
var acc types.StateAccount
@@ -73,7 +74,7 @@ func assertDBConsistency(t testing.TB, root common.Hash, clientDB ethdb.Database
storageTrieLeavesCount := 0
// check storage trie and storage snapshot consistency
- trie.AssertTrieConsistency(t, acc.Root, serverTrieDB, clientTrieDB, func(key, val []byte) error {
+ syncutils.AssertTrieConsistency(t, acc.Root, serverTrieDB, clientTrieDB, func(key, val []byte) error {
storageTrieLeavesCount++
snapshotVal := rawdb.ReadStorageSnapshot(clientDB, accHash, common.BytesToHash(key))
assert.Equal(t, val, snapshotVal)
@@ -89,7 +90,7 @@ func assertDBConsistency(t testing.TB, root common.Hash, clientDB ethdb.Database
}
func fillAccountsWithStorage(t *testing.T, serverDB ethdb.Database, serverTrieDB *trie.Database, root common.Hash, numAccounts int) common.Hash {
- newRoot, _ := trie.FillAccounts(t, serverTrieDB, root, numAccounts, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
+ newRoot, _ := syncutils.FillAccounts(t, serverTrieDB, root, numAccounts, func(t *testing.T, index int, account types.StateAccount) types.StateAccount {
codeBytes := make([]byte, 256)
_, err := rand.Read(codeBytes)
if err != nil {
@@ -102,7 +103,7 @@ func fillAccountsWithStorage(t *testing.T, serverDB ethdb.Database, serverTrieDB
// now create state trie
numKeys := 16
- account.Root, _, _ = trie.GenerateTrie(t, serverTrieDB, numKeys, common.HashLength)
+ account.Root, _, _ = syncutils.GenerateTrie(t, serverTrieDB, numKeys, common.HashLength)
return account
})
return newRoot
@@ -119,18 +120,18 @@ func FillAccountsWithOverlappingStorage(
) (common.Hash, map[*keystore.Key]*types.StateAccount) {
storageRoots := make([]common.Hash, 0, numOverlappingStorageRoots)
for i := 0; i < numOverlappingStorageRoots; i++ {
- storageRoot, _, _ := trie.GenerateTrie(t, trieDB, 16, common.HashLength)
+ storageRoot, _, _ := syncutils.GenerateTrie(t, trieDB, 16, common.HashLength)
storageRoots = append(storageRoots, storageRoot)
}
storageRootIndex := 0
- return trie.FillAccounts(t, trieDB, root, numAccounts, func(t *testing.T, i int, account types.StateAccount) types.StateAccount {
+ return syncutils.FillAccounts(t, trieDB, root, numAccounts, func(t *testing.T, i int, account types.StateAccount) types.StateAccount {
switch i % 3 {
case 0: // unmodified account
case 1: // account with overlapping storage root
account.Root = storageRoots[storageRootIndex%numOverlappingStorageRoots]
storageRootIndex++
case 2: // account with unique storage root
- account.Root, _, _ = trie.GenerateTrie(t, trieDB, 16, common.HashLength)
+ account.Root, _, _ = syncutils.GenerateTrie(t, trieDB, 16, common.HashLength)
}
return account
diff --git a/trie/test_trie.go b/sync/syncutils/test_trie.go
similarity index 84%
rename from trie/test_trie.go
rename to sync/syncutils/test_trie.go
index c61a8decc0..08c7516100 100644
--- a/trie/test_trie.go
+++ b/sync/syncutils/test_trie.go
@@ -1,7 +1,7 @@
// (c) 2021-2022, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
-package trie
+package syncutils
import (
cryptoRand "crypto/rand"
@@ -13,9 +13,11 @@ import (
"github.com/ava-labs/avalanchego/utils/wrappers"
"github.com/ava-labs/subnet-evm/accounts/keystore"
"github.com/ava-labs/subnet-evm/core/types"
+ "github.com/ava-labs/subnet-evm/trie"
"github.com/ava-labs/subnet-evm/trie/trienode"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/rlp"
"github.com/stretchr/testify/assert"
)
@@ -24,11 +26,11 @@ import (
// Returns the root of the generated trie, the slice of keys inserted into the trie in lexicographical
// order, and the slice of corresponding values.
// GenerateTrie reads from [rand] and the caller should call rand.Seed(n) for deterministic results
-func GenerateTrie(t *testing.T, trieDB *Database, numKeys int, keySize int) (common.Hash, [][]byte, [][]byte) {
+func GenerateTrie(t *testing.T, trieDB *trie.Database, numKeys int, keySize int) (common.Hash, [][]byte, [][]byte) {
if keySize < wrappers.LongLen+1 {
t.Fatal("key size must be at least 9 bytes (8 bytes for uint64 and 1 random byte)")
}
- testTrie := NewEmpty(trieDB)
+ testTrie := trie.NewEmpty(trieDB)
keys, values := FillTrie(t, numKeys, keySize, testTrie)
@@ -45,7 +47,7 @@ func GenerateTrie(t *testing.T, trieDB *Database, numKeys int, keySize int) (com
// FillTrie fills a given trie with [numKeys] number of keys, each of size [keySize]
// returns inserted keys and values
// FillTrie reads from [rand] and the caller should call rand.Seed(n) for deterministic results
-func FillTrie(t *testing.T, numKeys int, keySize int, testTrie *Trie) ([][]byte, [][]byte) {
+func FillTrie(t *testing.T, numKeys int, keySize int, testTrie *trie.Trie) ([][]byte, [][]byte) {
keys := make([][]byte, 0, numKeys)
values := make([][]byte, 0, numKeys)
@@ -70,18 +72,18 @@ func FillTrie(t *testing.T, numKeys int, keySize int, testTrie *Trie) ([][]byte,
// AssertTrieConsistency ensures given trieDB [a] and [b] both have the same
// non-empty trie at [root]. (all key/value pairs must be equal)
-func AssertTrieConsistency(t testing.TB, root common.Hash, a, b *Database, onLeaf func(key, val []byte) error) {
- trieA, err := New(TrieID(root), a)
+func AssertTrieConsistency(t testing.TB, root common.Hash, a, b *trie.Database, onLeaf func(key, val []byte) error) {
+ trieA, err := trie.New(trie.TrieID(root), a)
if err != nil {
t.Fatalf("error creating trieA, root=%s, err=%v", root, err)
}
- trieB, err := New(TrieID(root), b)
+ trieB, err := trie.New(trie.TrieID(root), b)
if err != nil {
t.Fatalf("error creating trieB, root=%s, err=%v", root, err)
}
- itA := NewIterator(trieA.NodeIterator(nil))
- itB := NewIterator(trieB.NodeIterator(nil))
+ itA := trie.NewIterator(trieA.NodeIterator(nil))
+ itB := trie.NewIterator(trieB.NodeIterator(nil))
count := 0
for itA.Next() && itB.Next() {
count++
@@ -100,16 +102,11 @@ func AssertTrieConsistency(t testing.TB, root common.Hash, a, b *Database, onLea
assert.Greater(t, count, 0)
}
-// CorruptTrie deletes every [n]th trie node from the trie given by [root] from the trieDB.
-// Assumes that the trie given by root can be iterated without issue.
-func CorruptTrie(t *testing.T, trieDB *Database, root common.Hash, n int) {
- batch := trieDB.diskdb.NewBatch()
- // next delete some trie nodes
- tr, err := New(TrieID(root), trieDB)
- if err != nil {
- t.Fatal(err)
- }
-
+// CorruptTrie deletes every [n]th trie node from the trie given by [tr] from the underlying [db].
+// Assumes [tr] can be iterated without issue.
+func CorruptTrie(t *testing.T, diskdb ethdb.Batcher, tr *trie.Trie, n int) {
+ // Delete some trie nodes
+ batch := diskdb.NewBatch()
nodeIt := tr.NodeIterator(nil)
count := 0
for nodeIt.Next(true) {
@@ -133,7 +130,7 @@ func CorruptTrie(t *testing.T, trieDB *Database, root common.Hash, n int) {
// [onAccount] is called if non-nil (so the caller can modify the account before it is stored in the secure trie).
// returns the new trie root and a map of funded keys to StateAccount structs.
func FillAccounts(
- t *testing.T, trieDB *Database, root common.Hash, numAccounts int,
+ t *testing.T, trieDB *trie.Database, root common.Hash, numAccounts int,
onAccount func(*testing.T, int, types.StateAccount) types.StateAccount,
) (common.Hash, map[*keystore.Key]*types.StateAccount) {
var (
@@ -143,7 +140,7 @@ func FillAccounts(
accounts = make(map[*keystore.Key]*types.StateAccount, numAccounts)
)
- tr, err := NewStateTrie(TrieID(root), trieDB)
+ tr, err := trie.NewStateTrie(trie.TrieID(root), trieDB)
if err != nil {
t.Fatalf("error opening trie: %v", err)
}
diff --git a/trie/triedb/hashdb/database.go b/trie/triedb/hashdb/database.go
index 72c758519f..cf9a6f2b17 100644
--- a/trie/triedb/hashdb/database.go
+++ b/trie/triedb/hashdb/database.go
@@ -48,10 +48,11 @@ var (
memcacheCleanReadMeter = metrics.NewRegisteredMeter("trie/memcache/clean/read", nil)
memcacheCleanWriteMeter = metrics.NewRegisteredMeter("trie/memcache/clean/write", nil)
- memcacheDirtyHitMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/hit", nil)
- memcacheDirtyMissMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/miss", nil)
- memcacheDirtyReadMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/read", nil)
- memcacheDirtyWriteMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/write", nil)
+ memcacheDirtyHitMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/hit", nil)
+ memcacheDirtyMissMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/miss", nil)
+ memcacheDirtyReadMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/read", nil)
+ memcacheDirtyWriteMeter = metrics.NewRegisteredMeter("trie/memcache/dirty/write", nil)
+
memcacheDirtySizeGauge = metrics.NewRegisteredGaugeFloat64("trie/memcache/dirty/size", nil)
memcacheDirtyChildSizeGauge = metrics.NewRegisteredGaugeFloat64("trie/memcache/dirty/childsize", nil)
memcacheDirtyNodesGauge = metrics.NewRegisteredGauge("trie/memcache/dirty/nodes", nil)
@@ -220,7 +221,7 @@ func (db *Database) Node(hash common.Hash) ([]byte, error) {
// Content unavailable in memory, attempt to retrieve from disk
enc := rawdb.ReadLegacyTrieNode(db.diskdb, hash)
- if len(enc) > 0 {
+ if len(enc) != 0 {
if db.cleans != nil {
db.cleans.Set(hash[:], enc)
memcacheCleanMissMeter.Mark(1)
@@ -287,9 +288,9 @@ func (db *Database) Dereference(root common.Hash) {
log.Error("Attempted to dereference the trie cache meta root")
return
}
-
db.lock.Lock()
defer db.lock.Unlock()
+
nodes, storage, start := len(db.dirties), db.dirtiesSize, time.Now()
db.dereference(root)
@@ -464,6 +465,7 @@ func (db *Database) Cap(limit common.StorageSize) error {
log.Debug("Persisted nodes from memory database", "nodes", nodes-len(db.dirties), "size", storage-db.dirtiesSize, "time", time.Since(start),
"flushnodes", db.flushnodes, "flushsize", db.flushsize, "flushtime", db.flushtime, "livenodes", len(db.dirties), "livesize", db.dirtiesSize)
+
return nil
}
@@ -522,6 +524,7 @@ func (db *Database) Commit(node common.Hash, report bool) error {
// Reset the garbage collection statistics
db.gcnodes, db.gcsize, db.gctime = 0, 0, 0
db.flushnodes, db.flushsize, db.flushtime = 0, 0, 0
+
return nil
}