From 65dd14a41f201ce4c08dac7a4b9fabbb678df61f Mon Sep 17 00:00:00 2001
From: Marko Baricevic <marbar3778@yahoo.com>
Date: Tue, 28 May 2024 13:49:22 +0200
Subject: [PATCH] cleanup

---
 mutable_tree.go     |  4 ++--
 nodedb.go           | 16 ++++++----------
 tree_random_test.go |  2 +-
 tree_test.go        |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/mutable_tree.go b/mutable_tree.go
index b868c79e7..614979690 100644
--- a/mutable_tree.go
+++ b/mutable_tree.go
@@ -813,7 +813,7 @@ func (tree *MutableTree) addUnsavedAddition(key []byte, node *fastnode.Node) {
 
 func (tree *MutableTree) saveFastNodeAdditions() error {
 	keysToSort := make([]string, 0)
-	tree.unsavedFastNodeAdditions.Range(func(k, v interface{}) bool {
+	tree.unsavedFastNodeAdditions.Range(func(k, _ interface{}) bool {
 		keysToSort = append(keysToSort, k.(string))
 		return true
 	})
@@ -837,7 +837,7 @@ func (tree *MutableTree) addUnsavedRemoval(key []byte) {
 
 func (tree *MutableTree) saveFastNodeRemovals() error {
 	keysToSort := make([]string, 0)
-	tree.unsavedFastNodeRemovals.Range(func(k, v interface{}) bool {
+	tree.unsavedFastNodeRemovals.Range(func(k, _ interface{}) bool {
 		keysToSort = append(keysToSort, k.(string))
 		return true
 	})
diff --git a/nodedb.go b/nodedb.go
index ad707867d..86304ec7a 100644
--- a/nodedb.go
+++ b/nodedb.go
@@ -447,7 +447,7 @@ func (ndb *nodeDB) deleteLegacyVersions(legacyLatestVersion int64) error {
 		return err
 	}
 	// Delete all legacy roots
-	if err := ndb.traversePrefix(legacyRootKeyFormat.Key(), func(key, value []byte) error {
+	if err := ndb.traversePrefix(legacyRootKeyFormat.Key(), func(key, _ []byte) error {
 		checkDeletePause()
 		return ndb.batch.Delete(key)
 	}); err != nil {
@@ -502,11 +502,9 @@ func (ndb *nodeDB) DeleteVersionsFrom(fromVersion int64) error {
 	}
 
 	// Delete the nodes for new format
-	err = ndb.traverseRange(nodeKeyPrefixFormat.KeyInt64(fromVersion), nodeKeyPrefixFormat.KeyInt64(latest+1), func(k, v []byte) error {
+	if err = ndb.traverseRange(nodeKeyPrefixFormat.KeyInt64(fromVersion), nodeKeyPrefixFormat.KeyInt64(latest+1), func(k, _ []byte) error {
 		return ndb.batch.Delete(k)
-	})
-
-	if err != nil {
+	}); err != nil {
 		return err
 	}
 
@@ -1093,7 +1091,7 @@ func (ndb *nodeDB) orphans() ([][]byte, error) {
 
 func (ndb *nodeDB) size() int {
 	size := 0
-	err := ndb.traverse(func(k, v []byte) error {
+	err := ndb.traverse(func(_, _ []byte) error {
 		size++
 		return nil
 	})
@@ -1199,7 +1197,7 @@ func (ndb *nodeDB) String() (string, error) {
 
 	buf.WriteByte('\n')
 
-	err = ndb.traverseNodes(func(node *Node) error {
+	if err = ndb.traverseNodes(func(node *Node) error {
 		switch {
 		case node == nil:
 			fmt.Fprintf(buf, "%s: <nil>\n", nodeKeyFormat.Prefix())
@@ -1212,9 +1210,7 @@ func (ndb *nodeDB) String() (string, error) {
 		}
 		index++
 		return nil
-	})
-
-	if err != nil {
+	}); err != nil {
 		return "", err
 	}
 
diff --git a/tree_random_test.go b/tree_random_test.go
index ffb699cb4..abae9cd0a 100644
--- a/tree_random_test.go
+++ b/tree_random_test.go
@@ -243,7 +243,7 @@ func testRandomOperations(t *testing.T, randSeed int64) {
 	// data is left behind in the database.
 	prevVersion := tree.Version()
 	keys := [][]byte{}
-	_, err = tree.Iterate(func(key, value []byte) bool {
+	_, err = tree.Iterate(func(key, _ []byte) bool {
 		keys = append(keys, key)
 		return false
 	})
diff --git a/tree_test.go b/tree_test.go
index 159e7578a..50b701a53 100644
--- a/tree_test.go
+++ b/tree_test.go
@@ -1792,7 +1792,7 @@ func TestNodeCacheStatisic(t *testing.T) {
 
 	for name, tc := range testcases {
 		tc := tc
-		t.Run(name, func(sub *testing.T) {
+		t.Run(name, func(_ *testing.T) {
 			stat := &Statistics{}
 			db, err := dbm.NewDB("test", "memdb", "")
 			require.NoError(t, err)