Self review fixes

ChainSafe · Jan 26, 2022 · 6c64521 · 6c64521
1 parent 0e92324
commit 6c64521
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/dot/state/service_test.go b/dot/state/service_test.go
@@ -293,8 +293,8 @@ func TestService_PruneStorage(t *testing.T) {
 	time.Sleep(1 * time.Second)
 
 	for _, v := range prunedArr {
-		_, err := serv.Storage.tries.getTrie(v.hash)
-		require.Error(t, err)
+		_, has := serv.Storage.tries.rootToTrie[v.hash]
+		require.False(t, has)
 	}
 }
 

diff --git a/dot/state/storage.go b/dot/state/storage.go
@@ -54,7 +54,7 @@ func NewStorageState(db chaindb.Database, blockState *BlockState,
 
 	storageTable := chaindb.NewTable(db, storagePrefix)
 
-	rootToTrie := newRootToTrieMap(storageTable, t)
+	tries := newTries(storageTable, t)
 
 	var p pruner.Pruner
 	if onlinePruner.Mode == pruner.Full {
@@ -69,7 +69,7 @@ func NewStorageState(db chaindb.Database, blockState *BlockState,
 
 	return &StorageState{
 		blockState:   blockState,
-		tries:        rootToTrie,
+		tries:        tries,
 		db:           storageTable,
 		observerList: []Observer{},
 		pruner:       p,
@@ -151,16 +151,6 @@ func (s *StorageState) loadTrie(root *common.Hash) (*trie.Trie, error) {
 	}
 
 	return s.tries.getTrie(*root)
-	// if t, has := s.tries.get(*root); has && t != nil {
-	// 	return t, nil
-	// }
-
-	// tr, err := s.LoadFromDB(*root)
-	// if err != nil {
-	// 	return nil, errTrieDoesNotExist(*root)
-	// }
-
-	// return tr, nil
 }
 
 // ExistsStorage check if the key exists in the storage trie with the given storage hash

diff --git a/dot/state/storage_test.go b/dot/state/storage_test.go
@@ -160,7 +160,7 @@ func TestStorage_StoreTrie_NotSyncing(t *testing.T) {
 
 	err = storage.StoreTrie(ts, nil)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(storage.tries.rootToTrie))
+	require.Equal(t, 2, storage.tries.triesInMemory())
 }
 
 func TestGetStorageChildAndGetStorageFromChild(t *testing.T) {

diff --git a/dot/state/tries.go b/dot/state/tries.go
@@ -18,7 +18,7 @@ type tries struct {
 	mapMutex   sync.RWMutex
 }
 
-func newRootToTrieMap(db chaindb.Database, t *trie.Trie) *tries {
+func newTries(db chaindb.Database, t *trie.Trie) *tries {
 	return &tries{
 		rootToTrie: map[common.Hash]*trie.Trie{
 			t.MustHash(): t,
@@ -97,7 +97,6 @@ func (t *tries) getTrie(root common.Hash) (tr *trie.Trie, err error) {
 		return nil, fmt.Errorf("cannot load root from database: %w", err)
 	}
 
-	fmt.Println("ROOT RETRIEVED: ", tr.RootNode())
 	calculatedRootHash := tr.MustHash()
 	if !calculatedRootHash.Equal(root) {
 		panic(fmt.Sprintf("trie does not have expected root, expected %s but got %s",

diff --git a/dot/state/tries_test.go b/dot/state/tries_test.go
@@ -17,13 +17,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func Test_newRootToTrieMap(t *testing.T) {
+func Test_newTries(t *testing.T) {
 	t.Parallel()
 
 	db := &chaindb.BadgerDB{}
 	tr := trie.NewEmptyTrie()
 
-	rootToTrie := newRootToTrieMap(db, tr)
+	rootToTrie := newTries(db, tr)
 
 	expectedRootToTrie := &tries{
 		rootToTrie: map[common.Hash]*trie.Trie{