revert some changes and enable prealloc and predeclared

tac0turtle · tac0turtle · commit d4063fea36fe · 2026-03-03T18:38:18.000+01:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -77,6 +77,11 @@ linters:
       - common-false-positives
       - legacy
       - std-error-handling
+    rules:
+      - path: _test\.go
+        linters:
+          - prealloc
+          - noctx
     paths:
       - third_party$
       - builtin$
@@ -86,8 +91,6 @@ linters:
     - errcheck
     - gocritic
     - nolintlint
-    - prealloc
-    - predeclared
     - testifylint
     - thelper
     - tparallel
diff --git a/block/internal/submitting/da_submitter.go b/block/internal/submitting/da_submitter.go
@@ -90,15 +90,15 @@ func (rs *retryState) Next(reason retryReason, pol retryPolicy) {
 }
 
 // clamp constrains a duration between min and max bounds
-func clamp(v, min, max time.Duration) time.Duration {
-	if min > max {
-		min, max = max, min
+func clamp(v, minTime, maxTime time.Duration) time.Duration {
+	if minTime > maxTime {
+		minTime, maxTime = maxTime, minTime
 	}
-	if v < min {
-		return min
+	if v < minTime {
+		return minTime
 	}
-	if v > max {
-		return max
+	if v > maxTime {
+		return maxTime
 	}
 	return v
 }
diff --git a/block/internal/syncing/syncer_backoff_test.go b/block/internal/syncing/syncer_backoff_test.go
@@ -121,7 +121,7 @@ func TestSyncer_BackoffOnDAError(t *testing.T) {
 				}
 
 				// Run sync loop
-				syncer.startSyncWorkers(context.Background())
+				syncer.startSyncWorkers(t.Context())
 				<-ctx.Done()
 				syncer.wg.Wait()
 
@@ -223,7 +223,7 @@ func TestSyncer_BackoffResetOnSuccess(t *testing.T) {
 		go syncer.processLoop()
 
 		// Run workers
-		syncer.startSyncWorkers(context.Background())
+		syncer.startSyncWorkers(t.Context())
 		<-ctx.Done()
 		syncer.wg.Wait()
 
@@ -294,7 +294,7 @@ func TestSyncer_BackoffBehaviorIntegration(t *testing.T) {
 			Return(nil, datypes.ErrBlobNotFound).Once()
 
 		go syncer.processLoop()
-		syncer.startSyncWorkers(context.Background())
+		syncer.startSyncWorkers(t.Context())
 		<-ctx.Done()
 		syncer.wg.Wait()
 
diff --git a/block/internal/syncing/syncer_benchmark_test.go b/block/internal/syncing/syncer_benchmark_test.go
@@ -44,7 +44,7 @@ func BenchmarkSyncerIO(b *testing.B) {
 
 				// run both loops
 				go fixt.s.processLoop()
-				fixt.s.startSyncWorkers(context.Background())
+				fixt.s.startSyncWorkers(b.Context())
 
 				require.Eventually(b, func() bool {
 					processedHeight, _ := fixt.s.store.Height(b.Context())
diff --git a/block/internal/syncing/syncer_test.go b/block/internal/syncing/syncer_test.go
@@ -416,7 +416,7 @@ func TestSyncLoopPersistState(t *testing.T) {
 		Return(nil, datypes.ErrHeightFromFuture)
 
 	go syncerInst1.processLoop()
-	syncerInst1.startSyncWorkers(context.Background())
+	syncerInst1.startSyncWorkers(t.Context())
 	syncerInst1.wg.Wait()
 	requireEmptyChan(t, errorCh)
 
@@ -479,7 +479,7 @@ func TestSyncLoopPersistState(t *testing.T) {
 
 	// when it starts, it should fetch from the last height it stopped at
 	t.Log("sync workers on instance2 started")
-	syncerInst2.startSyncWorkers(context.Background())
+	syncerInst2.startSyncWorkers(t.Context())
 	syncerInst2.wg.Wait()
 
 	t.Log("sync workers exited")
diff --git a/node/full_node_test.go b/node/full_node_test.go
@@ -40,7 +40,7 @@ func TestStartInstrumentationServer(t *testing.T) {
 
 	time.Sleep(100 * time.Millisecond)
 
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, fmt.Sprintf("http://%s/metrics", config.Instrumentation.PrometheusListenAddr), nil)
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("http://%s/metrics", config.Instrumentation.PrometheusListenAddr), nil)
 	require.NoError(err, "Failed to create Prometheus metrics request")
 	resp, err := http.DefaultClient.Do(req) //nolint:gosec // test-only request to local instrumentation endpoint
 	require.NoError(err, "Failed to get Prometheus metrics")
@@ -55,7 +55,7 @@ func TestStartInstrumentationServer(t *testing.T) {
 	require.NoError(err)
 	assert.Contains(string(body), "# HELP", "Prometheus metrics body should contain HELP lines")
 
-	req, err = http.NewRequestWithContext(t.Context(), http.MethodGet, fmt.Sprintf("http://%s/debug/pprof/", config.Instrumentation.PprofListenAddr), nil)
+	req, err = http.NewRequest(http.MethodGet, fmt.Sprintf("http://%s/debug/pprof/", config.Instrumentation.PprofListenAddr), nil)
 	require.NoError(err, "Failed to create pprof request")
 	resp, err = http.DefaultClient.Do(req) //nolint:gosec // test-only request to local instrumentation endpoint
 	require.NoError(err, "Failed to get Pprof index")
diff --git a/pkg/p2p/client.go b/pkg/p2p/client.go
@@ -415,9 +415,10 @@ func (c *Client) GetPeers() ([]peer.AddrInfo, error) {
 }
 
 func (c *Client) GetNetworkInfo() (NetworkInfo, error) {
-	var addrs []string
+	hostAddrs := c.host.Addrs()
+	addrs := make([]string, 0, len(hostAddrs))
 	peerIDSuffix := "/p2p/" + c.host.ID().String()
-	for _, a := range c.host.Addrs() {
+	for _, a := range hostAddrs {
 		addr := a.String()
 		// Only append peer ID if not already present
 		if !strings.HasSuffix(addr, peerIDSuffix) {
diff --git a/pkg/rpc/server/da_visualization_non_aggregator_test.go b/pkg/rpc/server/da_visualization_non_aggregator_test.go
@@ -33,7 +33,7 @@ func TestNonAggregatorHandleDASubmissions(t *testing.T) {
 	server := NewDAVisualizationServer(da, logger, false)
 
 	// Create test request
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/submissions", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da/submissions", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -63,7 +63,7 @@ func TestNonAggregatorHandleDAStats(t *testing.T) {
 	server := NewDAVisualizationServer(da, logger, false)
 
 	// Create test request
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/stats", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da/stats", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -89,7 +89,7 @@ func TestNonAggregatorHandleDAHealth(t *testing.T) {
 	server := NewDAVisualizationServer(da, logger, false)
 
 	// Create test request
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/health", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da/health", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -115,7 +115,7 @@ func TestNonAggregatorHandleDAVisualizationHTML(t *testing.T) {
 	// Create a non-aggregator server
 	server := NewDAVisualizationServer(da, logger, false)
 
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -144,7 +144,7 @@ func TestAggregatorWithNoSubmissionsHTML(t *testing.T) {
 	// Create an aggregator server but don't add any submissions
 	server := NewDAVisualizationServer(da, logger, true)
 
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
diff --git a/pkg/rpc/server/da_visualization_test.go b/pkg/rpc/server/da_visualization_test.go
@@ -133,7 +133,7 @@ func TestHandleDASubmissions(t *testing.T) {
 		},
 	}
 	server.RecordSubmission(result, 0.5, 1, []byte{})
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/submissions", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da/submissions", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -163,7 +163,7 @@ func TestHandleDABlobDetailsMissingID(t *testing.T) {
 	logger := zerolog.New(nil)
 	server := NewDAVisualizationServer(da, logger, true)
 
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/blob", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da/blob", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -178,7 +178,7 @@ func TestHandleDABlobDetailsInvalidID(t *testing.T) {
 	logger := zerolog.New(nil)
 	server := NewDAVisualizationServer(da, logger, true)
 
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/blob?id=invalid-hex", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da/blob?id=invalid-hex", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -205,7 +205,7 @@ func TestHandleDAVisualizationHTML(t *testing.T) {
 	}
 	server.RecordSubmission(result, 0.5, 1, []byte{})
 
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -265,7 +265,7 @@ func TestRegisterCustomHTTPEndpointsDAVisualization(t *testing.T) {
 	RegisterCustomHTTPEndpoints(mux, nil, nil, config.DefaultConfig(), nil, nopLogger, nil)
 
 	// Test /da endpoint
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/da", nil)
+	req, err := http.NewRequest(http.MethodGet, "/da", nil)
 	require.NoError(t, err)
 
 	rr := httptest.NewRecorder()
@@ -275,7 +275,7 @@ func TestRegisterCustomHTTPEndpointsDAVisualization(t *testing.T) {
 	assert.Equal(t, "text/html", rr.Header().Get("Content-Type"))
 
 	// Test /da/submissions endpoint
-	req, err = http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/submissions", nil)
+	req, err = http.NewRequest(http.MethodGet, "/da/submissions", nil)
 	require.NoError(t, err)
 
 	rr = httptest.NewRecorder()
@@ -285,7 +285,7 @@ func TestRegisterCustomHTTPEndpointsDAVisualization(t *testing.T) {
 	assert.Equal(t, "application/json", rr.Header().Get("Content-Type"))
 
 	// Test /da/blob endpoint (missing ID should return 400)
-	req, err = http.NewRequestWithContext(t.Context(), http.MethodGet, "/da/blob", nil)
+	req, err = http.NewRequest(http.MethodGet, "/da/blob", nil)
 	require.NoError(t, err)
 
 	rr = httptest.NewRecorder()
@@ -306,7 +306,7 @@ func TestRegisterCustomHTTPEndpointsWithoutServer(t *testing.T) {
 	endpoints := []string{"/da", "/da/submissions", "/da/blob"}
 
 	for _, endpoint := range endpoints {
-		req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, endpoint, nil)
+		req, err := http.NewRequest(http.MethodGet, endpoint, nil)
 		require.NoError(t, err)
 
 		rr := httptest.NewRecorder()
diff --git a/pkg/rpc/server/http_test.go b/pkg/rpc/server/http_test.go
@@ -29,7 +29,7 @@ func TestRegisterCustomHTTPEndpoints(t *testing.T) {
 	testServer := httptest.NewServer(mux)
 	defer testServer.Close()
 
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, testServer.URL+"/health/live", nil)
+	req, err := http.NewRequest(http.MethodGet, testServer.URL+"/health/live", nil)
 	assert.NoError(t, err)
 	resp, err := http.DefaultClient.Do(req) //nolint:gosec // test-only request to httptest server
 	assert.NoError(t, err)
@@ -46,7 +46,6 @@ func TestRegisterCustomHTTPEndpoints(t *testing.T) {
 }
 
 func TestHealthReady_aggregatorBlockDelay(t *testing.T) {
-	ctx := t.Context()
 	logger := zerolog.Nop()
 
 	type spec struct {
@@ -121,7 +120,7 @@ func TestHealthReady_aggregatorBlockDelay(t *testing.T) {
 			ts := httptest.NewServer(mux)
 			t.Cleanup(ts.Close)
 
-			req, err := http.NewRequestWithContext(ctx, http.MethodGet, ts.URL+"/health/ready", nil)
+			req, err := http.NewRequest(http.MethodGet, ts.URL+"/health/ready", nil)
 			require.NoError(t, err)
 			resp, err := http.DefaultClient.Do(req) //nolint:gosec // ok to use default client in tests
 			require.NoError(t, err)
diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go
@@ -30,7 +30,7 @@ import (
 
 func mustGETRequest(t *testing.T, url string) *http.Request {
 	t.Helper()
-	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, url, nil)
+	req, err := http.NewRequest(http.MethodGet, url, nil)
 	require.NoError(t, err)
 	return req
 }
diff --git a/pkg/telemetry/tracing.go b/pkg/telemetry/tracing.go
@@ -66,12 +66,12 @@ func InitTracing(ctx context.Context, cfg *config.InstrumentationConfig, logger
 	return tp.Shutdown, nil
 }
 
-func clamp(x, min, max float64) float64 {
-	if x < min {
-		return min
+func clamp(x, minFloat, maxFloat float64) float64 {
+	if x < minFloat {
+		return minFloat
 	}
-	if x > max {
-		return max
+	if x > maxFloat {
+		return maxFloat
 	}
 	return x
 }
diff --git a/scripts/test.go b/scripts/test.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"os"
@@ -30,8 +29,8 @@ func main() {
 			// For this example, we'll run tests in all directories with go.mod.
 
 			fmt.Printf("--> Running tests in: %s\n", modDir)
-			cmd := exec.CommandContext(context.Background(), "go", "test", "./...", "-cover")
-			cmd.Dir = modDir // Set the working directory for the command
+			cmd := exec.Command("go", "test", "./...", "-cover") //nolint:noctx // intentionally runs module-local test command
+			cmd.Dir = modDir                                     // Set the working directory for the command
 			cmd.Stdout = os.Stdout
 			cmd.Stderr = os.Stderr
 

Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,15 @@ func (rs *retryState) Next(reason retryReason, pol retryPolicy) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// clamp constrains a duration between min and max bounds`
`93`		`-func clamp(v, min, max time.Duration) time.Duration {`
`94`		`- if min > max {`
`95`		`- min, max = max, min`
	`93`	`+func clamp(v, minTime, maxTime time.Duration) time.Duration {`
	`94`	`+ if minTime > maxTime {`
	`95`	`+ minTime, maxTime = maxTime, minTime`
`96`	`96`	`}`
`97`		`- if v < min {`
`98`		`- return min`
	`97`	`+ if v < minTime {`
	`98`	`+ return minTime`
`99`	`99`	`}`
`100`		`- if v > max {`
`101`		`- return max`
	`100`	`+ if v > maxTime {`
	`101`	`+ return maxTime`
`102`	`102`	`}`
`103`	`103`	`return v`
`104`	`104`	`}`