fixed lint warnings

2nd attempt to remove useless lint warnings

fix make check

.github/workflows/go_test.yml

@@ -38,7 +38,7 @@ jobs:
       with:
         args: >
           -Dsonar.organization=dedis
-          -Dsonar.projectKey=dedis_debugsync
+          -Dsonar.projectKey=debugsync
           -Dsonar.go.tests.reportPaths=report.json
           -Dsonar.go.coverage.reportPaths=profile.cov
       env:

Makefile

@@ -9,9 +9,7 @@ lint:
 
 vet:
 	@echo "⚠️ Warning: the following only works with go >= 1.14" && \
-	go get go.dedis.ch/dela/internal/mcheck && \
-	go install go.dedis.ch/dela/internal/mcheck && \
-	go vet -vettool=`go env GOPATH`/bin/mcheck -commentLen -ifInit ./...
+	go vet ./...
 
 # target to run all the possible checks; it's a good habit to run it before
 # pushing code

mutex_test.go

@@ -4,6 +4,8 @@
 
 // GOMAXPROCS=10 go test
 
+//lint:file-ignore SA2001 Empty critical section is acceptable in the context of a test
+
 package debugsync
 
 import (

rwmutex_test.go

@@ -53,8 +53,8 @@ func TestParallelReaders(t *testing.T) {
 	doTestParallelReaders(4, 2)
 }
 
-func reader(rwm *RWMutex, num_iterations int, activity *int32, cdone chan bool) {
-	for i := 0; i < num_iterations; i++ {
+func reader(rwm *RWMutex, numIterations int, activity *int32, cdone chan bool) {
+	for i := 0; i < numIterations; i++ {
 		rwm.RLock()
 		n := atomic.AddInt32(activity, 1)
 		if n < 1 || n >= 10000 {
@@ -69,8 +69,8 @@ func reader(rwm *RWMutex, num_iterations int, activity *int32, cdone chan bool)
 	cdone <- true
 }
 
-func writer(rwm *RWMutex, num_iterations int, activity *int32, cdone chan bool) {
-	for i := 0; i < num_iterations; i++ {
+func writer(rwm *RWMutex, numIterations int, activity *int32, cdone chan bool) {
+	for i := 0; i < numIterations; i++ {
 		rwm.Lock()
 		n := atomic.AddInt32(activity, 10000)
 		if n != 10000 {
@@ -85,20 +85,20 @@ func writer(rwm *RWMutex, num_iterations int, activity *int32, cdone chan bool)
 	cdone <- true
 }
 
-func HammerRWMutex(gomaxprocs, numReaders, num_iterations int) {
+func HammerRWMutex(gomaxprocs, numReaders, numIterations int) {
 	runtime.GOMAXPROCS(gomaxprocs)
 	// Number of active readers + 10000 * number of active writers.
 	var activity int32
 	var rwm RWMutex
 	cdone := make(chan bool)
-	go writer(&rwm, num_iterations, &activity, cdone)
+	go writer(&rwm, numIterations, &activity, cdone)
 	var i int
 	for i = 0; i < numReaders/2; i++ {
-		go reader(&rwm, num_iterations, &activity, cdone)
+		go reader(&rwm, numIterations, &activity, cdone)
 	}
-	go writer(&rwm, num_iterations, &activity, cdone)
+	go writer(&rwm, numIterations, &activity, cdone)
 	for ; i < numReaders; i++ {
-		go reader(&rwm, num_iterations, &activity, cdone)
+		go reader(&rwm, numIterations, &activity, cdone)
 	}
 	// Wait for the 2 writers and all readers to finish.
 	for i := 0; i < 2+numReaders; i++ {

waitgroup.go

@@ -1,7 +1,6 @@
 package debugsync
 
 import (
-	"fmt"
 	"runtime/debug"
 	"sync"
 )
@@ -35,8 +34,7 @@ func (wg *WaitGroup) Done() {
 // Wait blocks until the WaitGroup counter is zero.
 func (wg *WaitGroup) Wait() {
 	if DebugIsOn {
-		msg := fmt.Sprintf("WaitGroup %v timed out", wg.wg)
-		waiting := startLockTimer(msg, debug.Stack())
+		waiting := startLockTimer("WaitGroup timed out", debug.Stack())
 		wg.wg.Wait()
 		close(waiting)
 	} else {

waitgroup_test.go

@@ -86,7 +86,6 @@ func TestWaitGroupRace(t *testing.T) {
 
 func TestWaitGroupAlign(t *testing.T) {
 	type X struct {
-		x  byte
 		wg WaitGroup
 	}
 	var x X