fix: remove reduntant variable redefinition

ethersphere · Mar 5, 2024 · 0a0fc20 · 0a0fc20
1 parent b8d9ec8
commit 0a0fc20
Show file tree

Hide file tree

Showing 71 changed files with 80 additions and 124 deletions.
diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go
@@ -467,7 +467,6 @@ func TestPostageHeaderError(t *testing.T) {
 	)
 	content := []byte{7: 0} // 8 zeros
 	for _, endpoint := range endpoints {
-		endpoint := endpoint
 		t.Run(endpoint+": empty batch", func(t *testing.T) {
 			t.Parallel()
 
@@ -571,7 +570,6 @@ func TestPostageDirectAndDeferred(t *testing.T) {
 	t.Parallel()
 
 	for _, endpoint := range []string{"bytes", "bzz", "chunks"} {
-		endpoint := endpoint
 
 		if endpoint != "chunks" {
 			t.Run(endpoint+" deferred", func(t *testing.T) {

diff --git a/pkg/api/balances_test.go b/pkg/api/balances_test.go
@@ -338,7 +338,6 @@ func Test_peerBalanceHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -387,7 +386,6 @@ func Test_compensatedPeerBalanceHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/bytes_test.go b/pkg/api/bytes_test.go
@@ -314,7 +314,6 @@ func TestBytesUploadHandlerInvalidInputs(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -364,7 +363,6 @@ func TestBytesGetHandlerInvalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/bzz_test.go b/pkg/api/bzz_test.go
@@ -209,10 +209,9 @@ func TestBzzUploadDownloadWithRedundancy(t *testing.T) {
 		})
 	}
 	for _, rLevel := range []redundancy.Level{1, 2, 3, 4} {
-		rLevel := rLevel
+
 		t.Run(fmt.Sprintf("level=%d", rLevel), func(t *testing.T) {
 			for _, encrypt := range []bool{false, true} {
-				encrypt := encrypt
 				shardCnt := rLevel.GetMaxShards()
 				parityCnt := rLevel.GetParities(shardCnt)
 				if encrypt {
@@ -229,7 +228,6 @@ func TestBzzUploadDownloadWithRedundancy(t *testing.T) {
 					case 3:
 						chunkCnt = shardCnt*shardCnt + 1
 					}
-					levels := levels
 					t.Run(fmt.Sprintf("encrypt=%v levels=%d chunks=%d", encrypt, levels, chunkCnt), func(t *testing.T) {
 						if levels > 2 && (encrypt == (rLevel%2 == 1)) {
 							t.Skip("skipping to save time")
@@ -618,7 +616,7 @@ func TestBzzFilesRangeRequests(t *testing.T) {
 	}
 
 	for _, upload := range uploads {
-		upload := upload
+
 		t.Run(upload.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -885,7 +883,6 @@ func Test_bzzDownloadHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/chequebook_test.go b/pkg/api/chequebook_test.go
@@ -768,7 +768,6 @@ func Test_chequebookLastPeerHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/chunk_test.go b/pkg/api/chunk_test.go
@@ -173,7 +173,6 @@ func TestChunkHandlersInvalidInputs(t *testing.T) {
 
 	method := http.MethodGet
 	for _, tc := range tests {
-		tc := tc
 		t.Run(method+" "+tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/cors_test.go b/pkg/api/cors_test.go
@@ -79,7 +79,7 @@ func TestCORSHeaders(t *testing.T) {
 			wantCORS:       false,
 		},
 	} {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -156,7 +156,7 @@ func TestCors(t *testing.T) {
 			expectedMethods: "GET, HEAD",
 		},
 	} {
-		tc := tc
+
 		t.Run(tc.endpoint, func(t *testing.T) {
 			t.Parallel()
 
@@ -212,7 +212,7 @@ func TestCorsStatus(t *testing.T) {
 			allowedMethods:    "GET, HEAD",
 		},
 	} {
-		tc := tc
+
 		t.Run(tc.endpoint, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/logger_test.go b/pkg/api/logger_test.go
@@ -178,7 +178,7 @@ func Test_loggerGetHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -244,7 +244,7 @@ func Test_loggerSetVerbosityHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/peer_test.go b/pkg/api/peer_test.go
@@ -246,7 +246,7 @@ func Test_peerConnectHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -295,7 +295,7 @@ func Test_peerDisconnectHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/pin_test.go b/pkg/api/pin_test.go
@@ -172,9 +172,9 @@ func TestPinHandlersInvalidInputs(t *testing.T) {
 	}}
 
 	for _, method := range []string{http.MethodGet, http.MethodPost, http.MethodDelete} {
-		method := method
+
 		for _, tc := range tests {
-			tc := tc
+
 			t.Run(method+" "+tc.name, func(t *testing.T) {
 				t.Parallel()
 

diff --git a/pkg/api/pingpong_test.go b/pkg/api/pingpong_test.go
@@ -114,7 +114,7 @@ func Test_pingpongHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/postage_test.go b/pkg/api/postage_test.go
@@ -790,8 +790,6 @@ func TestPostageAccessHandler(t *testing.T) {
 
 	for _, op1 := range success {
 		for _, op2 := range failure {
-			op1 := op1
-			op2 := op2
 			t.Run(op1.name+"-"+op2.name, func(t *testing.T) {
 				t.Parallel()
 
@@ -935,7 +933,7 @@ func Test_postageGetStampBucketsHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -997,7 +995,7 @@ func Test_postageGetStampHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/pss_test.go b/pkg/api/pss_test.go
@@ -435,7 +435,7 @@ func TestPssPostHandlerInvalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/settlements_test.go b/pkg/api/settlements_test.go
@@ -213,7 +213,7 @@ func Test_peerSettlementsHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/staking_test.go b/pkg/api/staking_test.go
@@ -161,7 +161,7 @@ func Test_stakingDepositHandler_invalidInputs(t *testing.T) {
 	}}
 
 	for _, tc := range tests {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/stewardship_test.go b/pkg/api/stewardship_test.go
@@ -99,9 +99,9 @@ func TestStewardshipInvalidInputs(t *testing.T) {
 	}}
 
 	for _, method := range []string{http.MethodGet, http.MethodPut} {
-		method := method
+
 		for _, tc := range tests {
-			tc := tc
+
 			t.Run(method+" "+tc.name, func(t *testing.T) {
 				t.Parallel()
 

diff --git a/pkg/api/subdomain_test.go b/pkg/api/subdomain_test.go
@@ -88,7 +88,7 @@ func TestSubdomains(t *testing.T) {
 			},
 		},
 	} {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/api/tag_test.go b/pkg/api/tag_test.go
@@ -222,9 +222,9 @@ func TestTagsHandlersInvalidInputs(t *testing.T) {
 	}}
 
 	for _, method := range []string{http.MethodGet, http.MethodDelete, http.MethodPatch} {
-		method := method
+
 		for _, tc := range tests {
-			tc := tc
+
 			t.Run(method+" "+tc.name, func(t *testing.T) {
 				t.Parallel()
 

diff --git a/pkg/api/util_test.go b/pkg/api/util_test.go
@@ -499,7 +499,6 @@ func TestMapStructure(t *testing.T) {
 		want: &mapSwarmAddressTest{SwarmAddressVal: swarm.MustParseHexAddress("1234567890abcdef")},
 	}}
 	for _, tc := range tests {
-		tc := tc
 
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()

diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go
@@ -42,7 +42,7 @@ func TestAuthorize(t *testing.T) {
 		},
 	}
 	for _, tC := range tt {
-		tC := tC
+
 		t.Run(tC.desc, func(t *testing.T) {
 			t.Parallel()
 
@@ -130,7 +130,7 @@ func TestEnforce(t *testing.T) {
 	}
 
 	for _, tC := range tt {
-		tC := tC
+
 		t.Run(tC.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/bmt/bmt_test.go b/pkg/bmt/bmt_test.go
@@ -60,7 +60,7 @@ func TestHasherEmptyData(t *testing.T) {
 	t.Parallel()
 
 	for _, count := range testSegmentCounts {
-		count := count
+
 		t.Run(fmt.Sprintf("%d_segments", count), func(t *testing.T) {
 			t.Parallel()
 
@@ -88,7 +88,7 @@ func TestSyncHasherCorrectness(t *testing.T) {
 	testData := testutil.RandBytesWithSeed(t, 4096, seed)
 
 	for _, count := range testSegmentCounts {
-		count := count
+
 		t.Run(fmt.Sprintf("segments_%v", count), func(t *testing.T) {
 			t.Parallel()
 			max := count * hashSize

diff --git a/pkg/bmt/proof_test.go b/pkg/bmt/proof_test.go
@@ -211,7 +211,7 @@ func TestProof(t *testing.T) {
 	}
 
 	for i := 0; i < 128; i++ {
-		i := i
+
 		t.Run(fmt.Sprintf("segmentIndex %d", i), func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/cac/cac_test.go b/pkg/cac/cac_test.go
@@ -89,7 +89,6 @@ func TestChunkInvariantsNew(t *testing.T) {
 			wantErr: nil,
 		},
 	} {
-		cc := cc
 		t.Run(cc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -135,7 +134,6 @@ func TestChunkInvariantsNewWithDataSpan(t *testing.T) {
 			wantErr: nil,
 		},
 	} {
-		cc := cc
 		t.Run(cc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -219,7 +217,7 @@ func TestInvalid(t *testing.T) {
 			),
 		},
 	} {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/encryption/mock/mock_test.go b/pkg/encryption/mock/mock_test.go
@@ -62,7 +62,7 @@ func TestEncryptor_Encrypt(t *testing.T) {
 			wantErr: mock.ErrInvalidXORKey,
 		},
 	} {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -125,7 +125,7 @@ func TestEncryptor_Decrypt(t *testing.T) {
 			wantErr: mock.ErrInvalidXORKey,
 		},
 	} {
-		tc := tc
+
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/feeds/testing/lookup.go b/pkg/feeds/testing/lookup.go
@@ -202,7 +202,6 @@ func TestFinderRandomIntervals(t *testing.T, finderf func(storage.Getter, *feeds
 	t.Parallel()
 
 	for j := 0; j < 3; j++ {
-		j := j
 		t.Run(fmt.Sprintf("random intervals %d", j), func(t *testing.T) {
 			t.Parallel()
 

diff --git a/pkg/file/buffer_test.go b/pkg/file/buffer_test.go
@@ -34,7 +34,7 @@ func TestChunkPipe(t *testing.T) {
 		{swarm.ChunkSize, swarm.ChunkSize},            // on, on
 	}
 	for i, tc := range dataWrites {
-		tc := tc
+
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			t.Parallel()
 
@@ -130,7 +130,7 @@ func TestCopyBuffer(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
+
 		t.Run(fmt.Sprintf("buf_%-4d/data_size_%d", tc.readBufferSize, tc.dataSize), func(t *testing.T) {
 			t.Parallel()
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ func TestSubdomains(t *testing.T) { @@
     			},
     		},
     	} {
-    		tc := tc
     		t.Run(tc.name, func(t *testing.T) {
     			t.Parallel()
@@ Expand Down @@