accept []byte key in trie.Load instead of common.Hash

dot/state/base_test.go

@@ -35,7 +35,7 @@ func TestTrie_StoreAndLoadFromDB(t *testing.T) {
 	expected := tt.MustHash()
 
 	tt = trie.NewEmptyTrie()
-	err = tt.Load(db, encroot)
+	err = tt.Load(db, encroot.ToBytes())
 	require.NoError(t, err)
 	require.Equal(t, expected, tt.MustHash())
 }

dot/state/storage.go

@@ -142,7 +142,7 @@ func (s *StorageState) TrieState(root *common.Hash) (*rtstorage.TrieState, error
 // LoadFromDB loads an encoded trie from the DB where the key is `root`
 func (s *StorageState) LoadFromDB(root common.Hash) (*trie.Trie, error) {
 	t := trie.NewEmptyTrie()
-	err := t.Load(s.db, root)
+	err := t.Load(s.db, root.ToBytes())
 	if err != nil {
 		return nil, err
 	}

lib/trie/database.go

@@ -145,26 +145,26 @@ func (t *Trie) loadProof(proofHashToNode map[string]Node, n Node) {
 
 // Load reconstructs the trie from the database from the given root hash.
 // It is used when restarting the node to load the current state trie.
-func (t *Trie) Load(db chaindb.Database, rootHash common.Hash) error {
-	if rootHash == EmptyHash {
+func (t *Trie) Load(db chaindb.Database, rootHashBytes []byte) error {
+	if len(rootHashBytes) == 0 {
 		t.root = nil
 		return nil
 	}
 
-	counter := 0
-	for _, v := range rootHash.ToBytes() {
-		if v != 0 {
-			break
-		}
-		counter++
-	}
+	// counter := 0
+	// for _, v := range rootHash.ToBytes() {
+	// 	if v != 0 {
+	// 		break
+	// 	}
+	// 	counter++
+	// }
 
-	// remove initial 0 bits
-	rootHashBytes := rootHash[counter:]
+	// // remove initial 0 bits
+	// rootHashBytes := rootHash[counter:]
 
 	encodedNode, err := db.Get(rootHashBytes)
 	if err != nil {
-		return fmt.Errorf("failed to find root key %s: %w", rootHash, err)
+		return fmt.Errorf("failed to find root key 0x%x: %w", rootHashBytes, err)
 	}
 
 	reader := bytes.NewReader(encodedNode)
@@ -221,10 +221,9 @@ func (t *Trie) load(db chaindb.Database, n Node) error {
 		childTrie := NewEmptyTrie()
 		value := t.Get(key)
 		// TODO: Tests this error
-		rootHash := common.BytesToHash(value)
-		err := childTrie.Load(db, rootHash)
+		err := childTrie.Load(db, value)
 		if err != nil {
-			return fmt.Errorf("failed to load child trie with root hash=%s: %w", rootHash, err)
+			return fmt.Errorf("failed to load child trie with root hash=0x%x: %w", value, err)
 		}
 
 		// TODO: Test this error

lib/trie/database_test.go

@@ -63,7 +63,7 @@ func TestTrie_DatabaseStoreAndLoad(t *testing.T) {
 		require.NoError(t, err)
 
 		res := NewEmptyTrie()
-		err = res.Load(db, trie.MustHash())
+		err = res.Load(db, trie.MustHash().ToBytes())
 		require.NoError(t, err)
 		require.Equal(t, trie.MustHash(), res.MustHash())
 		require.Equal(t, trie.String(), res.String())
@@ -135,7 +135,7 @@ func TestTrie_WriteDirty_Put(t *testing.T) {
 		require.NoError(t, err)
 
 		res := NewEmptyTrie()
-		err = res.Load(db, trie.MustHash())
+		err = res.Load(db, trie.MustHash().ToBytes())
 		require.NoError(t, err)
 		require.Equal(t, trie.MustHash(), res.MustHash())
 
@@ -205,7 +205,7 @@ func TestTrie_WriteDirty_PutReplace(t *testing.T) {
 		}
 
 		res := NewEmptyTrie()
-		err := res.Load(db, trie.MustHash())
+		err := res.Load(db, trie.MustHash().ToBytes())
 		require.NoError(t, err)
 		require.Equal(t, trie.MustHash(), res.MustHash())
 
@@ -265,7 +265,7 @@ func TestTrie_WriteDirty_Delete(t *testing.T) {
 			require.NoError(t, err)
 
 			res := NewEmptyTrie()
-			err = res.Load(db, trie.MustHash())
+			err = res.Load(db, trie.MustHash().ToBytes())
 			require.NoError(t, err)
 			require.Equal(t, trie.MustHash(), res.MustHash())
 
@@ -330,7 +330,7 @@ func TestTrie_WriteDirty_ClearPrefix(t *testing.T) {
 		require.NoError(t, err)
 
 		res := NewEmptyTrie()
-		err = res.Load(db, trie.MustHash())
+		err = res.Load(db, trie.MustHash().ToBytes())
 		require.NoError(t, err)
 
 		require.Equal(t, trie.MustHash(), res.MustHash())

lib/trie/proof.go

@@ -37,7 +37,7 @@ func GenerateProof(root []byte, keys [][]byte, db chaindb.Database) ([][]byte, e
 	trackedProofs := make(map[string][]byte)
 
 	proofTrie := NewEmptyTrie()
-	if err := proofTrie.Load(db, common.BytesToHash(root)); err != nil {
+	if err := proofTrie.Load(db, root); err != nil {
 		return nil, err
 	}
 

lib/trie/trie_endtoend_test.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/ChainSafe/gossamer/internal/trie/codec"
 	"github.com/ChainSafe/gossamer/internal/trie/node"
-	"github.com/ChainSafe/gossamer/lib/common"
 )
 
 const (
@@ -397,7 +396,7 @@ func TestTrieDiff(t *testing.T) {
 	}
 
 	dbTrie := NewEmptyTrie()
-	err = dbTrie.Load(storageDB, common.BytesToHash(newTrie.root.GetHash()))
+	err = dbTrie.Load(storageDB, newTrie.root.GetHash())
 	require.NoError(t, err)
 }