lint

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  deadline: 10m
+  timeout: 10m
 
 output:
   format: github-actions,colored-line-number

cmd/dcrdata/internal/middleware/apimiddleware.go

@@ -815,7 +815,7 @@ func ChartGroupingCtx(next http.Handler) http.Handler {
 
 // apiDocs generates a middleware with a "docs" in the context containing a map
 // of the routers handlers, etc.
-func apiDocs(mux *chi.Mux) func(next http.Handler) http.Handler {
+func apiDocs(mux *chi.Mux) func(next http.Handler) http.Handler { //nolint
 	var buf bytes.Buffer
 	err := json.Indent(&buf, []byte(docgen.JSONRoutesDoc(mux)), "", "\t")
 	if err != nil {

cmd/dcrdata/internal/notification/notifier.go

@@ -301,8 +301,10 @@ func (notifier *Notifier) processBlock(bh *wire.BlockHeader) {
 			go func(h BlockHandler) {
 				tStart := time.Now()
 				defer wg.Done()
-				defer log.Tracef("Notifier: BlockHandler %s completed in %v",
-					functionName(h), time.Since(tStart))
+				defer func() {
+					log.Tracef("Notifier: BlockHandler %s completed in %v",
+						functionName(h), time.Since(tStart))
+				}()
 				if err := h(bh); err != nil {
 					log.Errorf("block handler failed: %v", err)
 					return

exchanges/rateserver/types.go

@@ -225,8 +225,3 @@ func (client *rateClient) SendExchangeUpdate(update *dcrrates.ExchangeRateUpdate
 func (client *rateClient) Stream() GRPCStream {
 	return client.stream
 }
-
-// Determine if the grpc.ServerStream's context Done() channel has been closed.
-func (client *rateClient) isDone() bool {
-	return client.stream.Context().Err() != nil
-}

lint.sh

@@ -33,20 +33,6 @@ MODPATHS="./go.mod ./exchanges/go.mod ./gov/go.mod ./db/dcrpg/go.mod ./cmd/dcrda
     ./testutil/apiload/go.mod ./exchanges/rateserver/go.mod"
 #MODPATHS=$(find . -name go.mod -type f -print)
 
-alias superlint="golangci-lint run --deadline=10m \
-    --disable-all \
-    --enable govet \
-    --enable staticcheck \
-    --enable gosimple \
-    --enable unconvert \
-    --enable ineffassign \
-    --enable structcheck \
-    --enable goimports \
-    --enable misspell \
-    --enable unparam \
-    --enable asciicheck \
-    --enable makezero"
-
 # run lint on all listed modules
 set +e
 ERROR=0
@@ -55,7 +41,7 @@ for MODPATH in $MODPATHS; do
     module=$(dirname "${MODPATH}")
     pushd "$module" > /dev/null
     echo "Linting: $MODPATH"
-    superlint
+    golangci-lint run
     if [[ "$GV" =~ ^1.21 ]]; then
 		MOD_STATUS=$(git status --porcelain go.mod go.sum)
 		go mod tidy