cr feedback, remove QueryItem

ChainSafe · Oct 9, 2024 · 4d95a0a · 4d95a0a
1 parent ba4679e
commit 4d95a0a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/pkg/trie/triedb/lookup.go b/pkg/trie/triedb/lookup.go
@@ -12,10 +12,7 @@ import (
 	"github.com/ChainSafe/gossamer/pkg/trie/triedb/nibbles"
 )
 
-// Description of what kind of query will be made to the trie.
-type Query[Item any] func(data []byte) Item
-
-type TrieLookup[H hash.Hash, Hasher hash.Hasher[H], QueryItem any] struct {
+type TrieLookup[H hash.Hash, Hasher hash.Hasher[H]] struct {
 	// db to query from
 	db db.DBGetter
 	// hash to start at
@@ -26,21 +23,21 @@ type TrieLookup[H hash.Hash, Hasher hash.Hasher[H], QueryItem any] struct {
 	recorder TrieRecorder
 }
 
-func NewTrieLookup[H hash.Hash, Hasher hash.Hasher[H], QueryItem any](
+func NewTrieLookup[H hash.Hash, Hasher hash.Hasher[H]](
 	db db.DBGetter,
 	hash H,
 	cache Cache,
 	recorder TrieRecorder,
-) TrieLookup[H, Hasher, QueryItem] {
-	return TrieLookup[H, Hasher, QueryItem]{
+) TrieLookup[H, Hasher] {
+	return TrieLookup[H, Hasher]{
 		db:       db,
 		hash:     hash,
 		cache:    cache,
 		recorder: recorder,
 	}
 }
 
-func (l *TrieLookup[H, Hasher, QueryItem]) lookupNode(
+func (l *TrieLookup[H, Hasher]) lookupNode(
 	nibbleKey nibbles.Nibbles, fullKey []byte,
 ) (codec.EncodedNode, error) {
 	// Start from root node and going downwards
@@ -132,7 +129,7 @@ func (l *TrieLookup[H, Hasher, QueryItem]) lookupNode(
 	}
 }
 
-func (l *TrieLookup[H, Hasher, QueryItem]) lookupValue(
+func (l *TrieLookup[H, Hasher]) lookupValue(
 	fullKey []byte, keyNibbles nibbles.Nibbles,
 ) (value []byte, err error) {
 	node, err := l.lookupNode(keyNibbles, fullKey)
@@ -158,7 +155,7 @@ func (l *TrieLookup[H, Hasher, QueryItem]) lookupValue(
 
 // fetchValue gets the value from the node, if it is inlined we can return it
 // directly. But if it is hashed (V1) we have to look up for its value in the DB
-func (l *TrieLookup[H, Hasher, QueryItem]) fetchValue(
+func (l *TrieLookup[H, Hasher]) fetchValue(
 	prefix nibbles.Prefix, fullKey []byte, value codec.EncodedValue,
 ) ([]byte, error) {
 	switch v := value.(type) {
@@ -181,7 +178,7 @@ func (l *TrieLookup[H, Hasher, QueryItem]) fetchValue(
 	}
 }
 
-func (l *TrieLookup[H, Hasher, QueryItem]) recordAccess(access TrieAccess) {
+func (l *TrieLookup[H, Hasher]) recordAccess(access TrieAccess) {
 	if l.recorder != nil {
 		l.recorder.Record(access)
 	}

diff --git a/pkg/trie/triedb/lookup_test.go b/pkg/trie/triedb/lookup_test.go
@@ -16,7 +16,7 @@ func TestTrieDB_Lookup(t *testing.T) {
 	t.Run("root_not_exists_in_db", func(t *testing.T) {
 		db := newTestDB(t)
 		empty := runtime.BlakeTwo256{}.Hash([]byte{0})
-		lookup := NewTrieLookup[hash.H256, runtime.BlakeTwo256, []byte](db, empty, nil, nil)
+		lookup := NewTrieLookup[hash.H256, runtime.BlakeTwo256](db, empty, nil, nil)
 
 		value, err := lookup.lookupValue([]byte("test"), nibbles.NewNibbles([]byte("test")))
 		assert.Nil(t, value)

diff --git a/pkg/trie/triedb/triedb.go b/pkg/trie/triedb/triedb.go
@@ -140,7 +140,7 @@ func (t *TrieDB[H, Hasher]) lookup(fullKey []byte, partialKey nibbles.Nibbles, h
 		var partialIdx uint
 		switch node := handle.(type) {
 		case persisted[H]:
-			lookup := NewTrieLookup[H, Hasher, []byte](t.db, node.hash, t.cache, t.recorder)
+			lookup := NewTrieLookup[H, Hasher](t.db, node.hash, t.cache, t.recorder)
 			val, err := lookup.lookupValue(fullKey, partialKey)
 			if err != nil {
 				return nil, err