fix linter

erigontech · Dec 3, 2024 · 9b78454 · 9b78454
1 parent d95499f
commit 9b78454
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 81 deletions.
diff --git a/erigon-lib/commitment/hex_patricia_hashed.go b/erigon-lib/commitment/hex_patricia_hashed.go
@@ -1194,7 +1194,7 @@ func (hph *HexPatriciaHashed) createAccountNode(c *cell, row int, hashedKey []by
 	return accountNode, nil
 }
 
-func (hph *HexPatriciaHashed) nCellsInRow(row int) int {
+func (hph *HexPatriciaHashed) nCellsInRow(row int) int { //nolint:unused
 	count := 0
 	for col := 0; col < 16; col++ {
 		c := &hph.grid[row][col]
@@ -1260,7 +1260,7 @@ func (hph *HexPatriciaHashed) ToTrie(hashedKey []byte, codeReads map[libcommon.H
 				return nil, err
 			}
 			storageValueNode := trie.ValueNode(storageUpdate.Storage[:storageUpdate.StorageLen])
-			nextNode = &storageValueNode
+			nextNode = &storageValueNode //nolint:ineffassign, wastedassign
 			break
 		} else if cellToExpand.accountAddrLen > 0 { // account cell
 			accNode, err := hph.createAccountNode(cellToExpand, row, hashedKey, codeReads)
@@ -1296,7 +1296,7 @@ func (hph *HexPatriciaHashed) ToTrie(hashedKey []byte, codeReads map[libcommon.H
 			fullNode.Children[currentNibble] = nextNode // ready to expand next nibble in the path
 		} else if accNode, ok := currentNode.(*trie.AccountNode); ok {
 			if len(hashedKey) <= 64 { // no storage, stop here
-				nextNode = nil
+				nextNode = nil // nolint:ineffassign, wastedassign
 				break
 			}
 			// there is storage so we need to expand further
@@ -2634,7 +2634,7 @@ func (hph *HexPatriciaHashed) HashAndNibblizeKey(key []byte) []byte {
 	return nibblized
 }
 
-func nibblize(key []byte) []byte {
+func nibblize(key []byte) []byte { // nolint:unused
 	nibblized := make([]byte, len(key)*2)
 	for i, b := range key {
 		nibblized[i*2] = (b >> 4) & 0xf

diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod
@@ -47,6 +47,7 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0
 	github.com/stretchr/testify v1.9.0
 	github.com/tidwall/btree v1.6.0
+	github.com/ugorji/go/codec v1.2.12
 	go.uber.org/mock v0.5.0
 	golang.org/x/crypto v0.29.0
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c

diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum
@@ -476,6 +476,8 @@ github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZ
 github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
 github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
 github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/erigon-lib/trie/retain_list_test.go b/erigon-lib/trie/retain_list_test.go
@@ -40,6 +40,7 @@ func FakePreimage(hash libcommon.Hash) libcommon.Hash {
 // especially useful for tests which want to manually manipulate the hash
 // databases without worrying about generating and tracking pre-images.
 func NewManualProofRetainer(t *testing.T, acc *accounts.Account, rl *RetainList, keys [][]byte) *DefaultProofRetainer {
+	t.Helper()
 	var accHexKey []byte
 	var storageKeys []libcommon.Hash
 	var storageHexKeys [][]byte

diff --git a/erigon-lib/trie/trie_transform.go b/erigon-lib/trie/trie_transform.go
diff --git a/erigon-lib/trie/witness.go b/erigon-lib/trie/witness.go
@@ -131,7 +131,7 @@ func NewWitnessFromReader(input io.Reader, trace bool) (*Witness, error) {
 	if trace {
 		fmt.Println("end of read ***** ")
 	}
-	if err != nil && err != io.EOF {
+	if err != nil && !errors.Is(err, io.EOF) {
 		return nil, err
 	}
 

diff --git a/erigon-lib/trie/witness_operators.go b/erigon-lib/trie/witness_operators.go
@@ -53,7 +53,7 @@ type OperatorHash struct {
 
 func (o *OperatorHash) WriteTo(output *OperatorMarshaller) error {
 	if err := output.WriteOpCode(OpHash); err != nil {
-		return nil
+		return err
 	}
 	return output.WriteHash(o.Hash)
 }