Moving golnagci-lint to v1.46

cloudflare · May 11, 2022 · be60a91 · be60a91
1 parent a4b8552
commit be60a91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Linting
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.45
+          version: v1.46
           args: --config=./.etc/golangci.yml ./...
       - name: Check shadowing
         run: |

diff --git a/ecc/fourq/point_test.go b/ecc/fourq/point_test.go
@@ -125,7 +125,7 @@ func TestScalarMult(t *testing.T) {
 
 func TestScalar(t *testing.T) {
 	const testTimes = 1 << 12
-	var x, xx [5]uint64
+	var xx [5]uint64
 	two256 := big.NewInt(1)
 	two256.Lsh(two256, 256)
 	two64 := big.NewInt(1)
@@ -137,9 +137,7 @@ func TestScalar(t *testing.T) {
 		for i := 0; i < testTimes; i++ {
 			bigX, _ := rand.Int(rand.Reader, two256)
 			conv.BigInt2Uint64Le(xx[:], bigX)
-			for j := range xx {
-				x[j] = xx[j]
-			}
+			x := xx
 			bigY, _ := rand.Int(rand.Reader, two64)
 			y := bigY.Int64()
 			bigY.SetInt64(y)
@@ -160,9 +158,7 @@ func TestScalar(t *testing.T) {
 		for i := 0; i < testTimes; i++ {
 			bigX, _ := rand.Int(rand.Reader, two256)
 			conv.BigInt2Uint64Le(xx[:], bigX)
-			for j := range xx {
-				x[j] = xx[j]
-			}
+			x := xx
 			bigY, _ := rand.Int(rand.Reader, two64)
 			y := bigY.Int64()
 			bigY.SetInt64(y)
@@ -182,9 +178,7 @@ func TestScalar(t *testing.T) {
 		for i := 0; i < testTimes; i++ {
 			bigX, _ := rand.Int(rand.Reader, two256)
 			conv.BigInt2Uint64Le(xx[:], bigX)
-			for j := range xx {
-				x[j] = xx[j]
-			}
+			x := xx
 
 			condAddOrderN(&x)
 			got := conv.Uint64Le2BigInt(x[:])
@@ -219,7 +213,7 @@ func TestScalar(t *testing.T) {
 			}
 
 			if got.Cmp(want) != 0 {
-				test.ReportError(t, got, want, x)
+				test.ReportError(t, got, want, k)
 			}
 		}
 	})