linting

Author: cool-develope

.github/workflows/lint.yml

@@ -15,8 +15,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '^1.20.0'
+          go-version: "^1.20.0"
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.2
+          version: v1.55.2

Makefile

@@ -36,7 +36,7 @@ format:
 
 # look into .golangci.yml for enabling / disabling linters
 golangci_lint_cmd=golangci-lint
-golangci_version=v1.51.2
+golangci_version=v1.55.2
 
 lint:
 	@echo "--> Running linter"

db/memdb.go

@@ -37,7 +37,7 @@ func newPair(key, value []byte) item {
 	return item{key: key, value: value}
 }
 
-// MemDB is an in-memory database backend using a B-tree for storage.
+// MemDB is an in-memory database backend using a B-tree for the test purpose.
 //
 // For performance reasons, all given and returned keys and values are pointers to the in-memory
 // database, so modifying them will cause the stored values to be modified as well. All DB methods

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/emicklei/dot v1.6.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/mock v1.6.0
+	github.com/google/btree v1.1.2
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/crypto v0.18.0
 )
@@ -26,7 +27,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/btree v1.1.2 // indirect
 	github.com/klauspost/compress v1.15.9 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect

nodedb.go

@@ -326,21 +326,7 @@ func (ndb *nodeDB) saveFastNodeUnlocked(node *fastnode.Node, shouldAddToCache bo
 
 // Has checks if a node key exists in the database.
 func (ndb *nodeDB) Has(nk []byte) (bool, error) {
-	key := ndb.nodeKey(nk)
-
-	// if ldb, ok := ndb.db.(*dbm.GoLevelDB); ok {
-	// 	exists, err := ldb.DB().Has(key, nil)
-	// 	if err != nil {
-	// 		return false, err
-	// 	}
-	// 	return exists, nil
-	// }
-	value, err := ndb.db.Get(key)
-	if err != nil {
-		return false, err
-	}
-
-	return value != nil, nil
+	return ndb.db.Has(ndb.nodeKey(nk))
 }
 
 // resetBatch reset the db batch, keep low memory used