Tidy, fmt

Author: zivkovicmilos

contribs/gnostats/Makefile

@@ -1,5 +1,11 @@
+rundep := go run -modfile ../../misc/devdeps/go.mod
+golangci_lint := $(rundep) github.com/golangci/golangci-lint/cmd/golangci-lint
+
 .PHONY: protoc
 protoc:
 	# Make sure the following prerequisites are installed before running these commands:
 	# https://grpc.io/docs/languages/go/quickstart/#prerequisites
 	protoc --proto_path=./ --go_out=./ --go-grpc_out=./ ./proto/*.proto
+
+lint:
+	$(golangci_lint) --config ../../.github/golangci.yml run ./...

contribs/gnostats/agent/agent_test.go

@@ -71,19 +71,19 @@ func (m *mockPushDataClient) SendMsg(msg any) error                 { panic("sho
 func (m *mockPushDataClient) RecvMsg(msg any) error                 { panic("should never happen") }
 
 // Helpers that generate random string and int
-func randomIntInRange(t *testing.T, min, max int) int {
+func randomIntInRange(t *testing.T, minVal, maxVal int) int {
 	t.Helper()
 
-	require.Less(t, min, max)
+	require.Less(t, minVal, maxVal)
 
-	diff := int64(max - min + 1)
+	diff := int64(maxVal - minVal + 1)
 
 	require.Greater(t, diff, int64(0))
 
 	n, err := rand.Int(rand.Reader, big.NewInt(diff))
 	require.NoError(t, err)
 
-	return int(n.Int64()) + min
+	return int(n.Int64()) + minVal
 }
 
 func randomStringOfLength(t *testing.T, length int) string {
@@ -102,10 +102,10 @@ func randomStringOfLength(t *testing.T, length int) string {
 	return string(randBytes)
 }
 
-func randomStringOfLengthInRange(t *testing.T, min, max int) string {
+func randomStringOfLengthInRange(t *testing.T, minVal, maxVal int) string {
 	t.Helper()
 
-	return randomStringOfLength(t, randomIntInRange(t, min, max))
+	return randomStringOfLength(t, randomIntInRange(t, minVal, maxVal))
 }
 
 func randomNodeInfo(t *testing.T) p2pTypes.NodeInfo {

contribs/gnostats/agent/collector_test.go

@@ -262,7 +262,9 @@ func TestCollector_DynamicTimeout(t *testing.T) {
 	mockBatch.On("BlockResults", (*uint64)(nil)).Return(nil)
 
 	// Set up a context and a sendLatency that will trigger a timeout
-	ctx, _ := context.WithTimeout(context.Background(), time.Millisecond)
+	ctx, cancelFn := context.WithTimeout(context.Background(), time.Millisecond)
+	defer cancelFn()
+
 	mockBatch.sendLatency = time.Second
 	mockBatch.On("Send", ctx).Return([]any{})
 
@@ -340,7 +342,9 @@ func TestCollector_StaticTimeout(t *testing.T) {
 	mockBatch.On("Status").Return(nil)
 
 	// Set up a context and a sendLatency that will trigger a timeout
-	ctx, _ := context.WithTimeout(context.Background(), time.Millisecond)
+	ctx, cancelFn := context.WithTimeout(context.Background(), time.Millisecond)
+	defer cancelFn()
+
 	mockBatch.sendLatency = time.Second
 	mockBatch.On("Send", ctx).Return([]any{})