Merge pull request #51 from MariusVanDerWijden/ci_v3

.github: setup ci

.github/workflows/test.yaml

@@ -4,12 +4,12 @@ name: node-crawler workflow
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - '**'
   pull_request:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 jobs:
@@ -26,7 +26,7 @@ jobs:
     - name: Lint
       run: ./bin/golangci-lint run --config .golangci.yml
     - name: Vet
-      run: go vet
+      run: go vet ./...
 
   test:
     runs-on: ubuntu-latest

.golangci.yml

@@ -0,0 +1,44 @@
+# This file configures github.com/golangci/golangci-lint.
+
+run:
+  timeout: 20m
+  tests: true
+  # default is true. Enables skipping of directories:
+  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
+  skip-dirs-use-default: true
+
+linters:
+  disable-all: true
+  enable:
+    - goconst
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - misspell
+    - unconvert
+    - typecheck
+# this repo contains a few copied files from go-ethereum, 
+# and some of them have unused fields/functions
+    #- unused
+    - staticcheck
+    - bidichk
+    - durationcheck
+    - exportloopref
+    - whitespace
+
+    # - structcheck # lots of false positives
+    # - errcheck #lot of false positives
+    # - contextcheck
+    # - errchkjson # lots of false positives
+    # - errorlint # this check crashes
+    # - exhaustive # silly check
+    # - makezero # false positives
+    # - nilerr # several intentional
+
+linters-settings:
+  gofmt:
+    simplify: true
+  goconst:
+    min-len: 3 # minimum length of string constant
+    min-occurrences: 6 # minimum number of occurrences

cmd/crawler/api.go

@@ -87,7 +87,6 @@ func transferNewNodes(crawlerDB, nodeDB *sql.DB) error {
 		// they are normally recoverable, and a lot of the time, it's
 		// because the database is locked by the crawler.
 		return fmt.Errorf("error starting transaction to read nodes: %w", err)
-
 	}
 	defer crawlerDBTx.Rollback()
 

pkg/crawler/crawl.go

@@ -175,52 +175,49 @@ func (c *crawler) runIterator(done chan<- enode.Iterator, it enode.Iterator) {
 
 func (c *crawler) getClientInfoLoop() {
 	defer func() { c.Done() }()
-	for {
-		select {
-		case n, ok := <-c.reqCh:
-			if !ok {
-				return
-			}
+	for n := range c.reqCh {
+		if n == nil {
+			return
+		}
 
-			var tooManyPeers bool
-			var scoreInc int
+		var tooManyPeers bool
+		var scoreInc int
 
-			info, err := getClientInfo(c.genesis, c.networkID, c.nodeURL, n)
-			if err != nil {
-				log.Warn("GetClientInfo failed", "error", err, "nodeID", n.ID())
-				if strings.Contains(err.Error(), "too many peers") {
-					tooManyPeers = true
-				}
-			} else {
-				scoreInc = 10
+		info, err := getClientInfo(c.genesis, c.networkID, c.nodeURL, n)
+		if err != nil {
+			log.Warn("GetClientInfo failed", "error", err, "nodeID", n.ID())
+			if strings.Contains(err.Error(), "too many peers") {
+				tooManyPeers = true
 			}
+		} else {
+			scoreInc = 10
+		}
 
-			if info != nil {
-				log.Info(
-					"Updating node info",
-					"client_type", info.ClientType,
-					"version", info.SoftwareVersion,
-					"network_id", info.NetworkID,
-					"caps", info.Capabilities,
-					"fork_id", info.ForkID,
-					"height", info.Blockheight,
-					"td", info.TotalDifficulty,
-					"head", info.HeadHash,
-				)
-			}
+		if info != nil {
+			log.Info(
+				"Updating node info",
+				"client_type", info.ClientType,
+				"version", info.SoftwareVersion,
+				"network_id", info.NetworkID,
+				"caps", info.Capabilities,
+				"fork_id", info.ForkID,
+				"height", info.Blockheight,
+				"td", info.TotalDifficulty,
+				"head", info.HeadHash,
+			)
+		}
 
-			c.Lock()
-			node := c.output[n.ID()]
-			node.N = n
-			node.Seq = n.Seq()
-			if info != nil {
-				node.Info = info
-			}
-			node.TooManyPeers = tooManyPeers
-			node.Score += scoreInc
-			c.output[n.ID()] = node
-			c.Unlock()
+		c.Lock()
+		node := c.output[n.ID()]
+		node.N = n
+		node.Seq = n.Seq()
+		if info != nil {
+			node.Info = info
 		}
+		node.TooManyPeers = tooManyPeers
+		node.Score += scoreInc
+		c.output[n.ID()] = node
+		c.Unlock()
 	}
 }
 

pkg/vparser/vparser_test.go

@@ -6,7 +6,6 @@ import (
 )
 
 func TestParseVersionString(t *testing.T) {
-
 	type ParseTestCase struct {
 		name string
 		args string