address comments

Author: MaksymMalicki

core/felt/address.go

@@ -29,11 +29,3 @@ func (a *Address) Unmarshal(e []byte) {
 func (a *Address) SetBytesCanonical(data []byte) error {
 	return (*Felt)(a).SetBytesCanonical(data)
 }
-
-func (a *Address) IsZero() bool {
-	return (*Felt)(a).IsZero()
-}
-
-func (a *Address) Equal(b *Address) bool {
-	return (*Felt)(a).Equal((*Felt)(b))
-}

core/felt/utils.go

@@ -0,0 +1,12 @@
+package felt
+
+func IsZero[F FeltLike](v *F) bool {
+	f := Felt(*v)
+	return f.IsZero()
+}
+
+func Equal[F FeltLike](a, b *F) bool {
+	fa := Felt(*a)
+	fb := Felt(*b)
+	return fa.Equal(&fb)
+}

core/trie2/triedb/hashdb/database.go

@@ -86,7 +86,7 @@ func (d *Database) readNode(
 func (d *Database) NewIterator(id trieutils.TrieID) (db.Iterator, error) {
 	key := id.Bucket().Key()
 	owner := id.Owner()
-	if !owner.Equal(&felt.Address{}) {
+	if !felt.IsZero(&owner) {
 		oBytes := owner.Bytes()
 		key = append(key, oBytes[:]...)
 	}

core/trie2/triedb/hashdb/dirty_cache.go

@@ -31,7 +31,7 @@ func (c *dirtyCache) putNode(
 		c.classNodes[keyStr] = node
 	}
 
-	if owner.IsZero() {
+	if felt.IsZero(owner) {
 		c.contractNodes[keyStr] = node
 	} else {
 		if _, ok := c.contractStorageNodes[*owner]; !ok {
@@ -52,7 +52,7 @@ func (c *dirtyCache) getNode(
 		return node, ok
 	}
 
-	if owner.IsZero() {
+	if felt.IsZero(owner) {
 		node, ok := c.contractNodes[keyStr]
 		return node, ok
 	}

core/trie2/triedb/pathdb/database.go

@@ -94,7 +94,7 @@ func (d *Database) NewIterator(id trieutils.TrieID) (db.Iterator, error) {
 	)
 
 	owner := id.Owner()
-	if !owner.Equal(&felt.Address{}) {
+	if !felt.IsZero(&owner) {
 		ob := owner.Bytes()
 		ownerBytes = ob[:]
 	}

core/trie2/triedb/pathdb/layertree_test.go

@@ -254,7 +254,7 @@ func (t *layerTracker) findNodeInLayer(
 		return nil, false
 	}
 
-	if owner.IsZero() {
+	if felt.IsZero(owner) {
 		if nodeMap, ok := t.contractNodes[*root]; ok {
 			if node, exists := nodeMap[*path]; exists {
 				return node.Blob(), true

core/trie2/triedb/pathdb/nodeset.go

@@ -49,7 +49,7 @@ func (s *nodeSet) node(
 	}
 
 	// contract trie nodes
-	if owner.IsZero() {
+	if felt.IsZero(owner) {
 		node, ok := s.contractNodes[*path]
 		return node, ok
 	}

core/trie2/triedb/rawdb/database.go

@@ -48,7 +48,7 @@ func (d *Database) readNode(
 func (d *Database) NewIterator(id trieutils.TrieID) (db.Iterator, error) {
 	key := id.Bucket().Key()
 	owner := id.Owner()
-	if !owner.Equal(&felt.Address{}) {
+	if !felt.IsZero(&owner) {
 		oBytes := owner.Bytes()
 		key = append(key, oBytes[:]...)
 	}

core/trie2/triedb/rawdb/database_test.go

@@ -62,7 +62,7 @@ func createContractMergeNodeSet(
 	childSets := make(map[felt.Address]*trienode.NodeSet)
 
 	for owner, ownerNodes := range nodes {
-		if owner.IsZero() {
+		if felt.IsZero(&owner) {
 			for path, node := range ownerNodes {
 				ownerSet.Add(&path, node)
 			}