@@ -7,9 +7,10 @@ package fat32_test
7
7
8
8
import (
9
9
"bytes"
10
+ "crypto/rand"
10
11
"fmt"
11
12
"io"
12
- "math/rand/v2"
13
+ mathrandv2 "math/rand/v2"
13
14
"os"
14
15
"path"
15
16
"path/filepath"
@@ -249,8 +250,6 @@ func TestFat32Read(t *testing.T) {
249
250
}
250
251
//nolint:thelper // this is not a helper function
251
252
runTest := func (t * testing.T , pre , post int64 ) {
252
- seed := [32 ]byte {}
253
- chacha := rand .NewChaCha8 (seed )
254
253
for _ , t2 := range tests {
255
254
tt := t2
256
255
t .Run (fmt .Sprintf ("blocksize %d filesize %d bytechange %d" , tt .filesize , tt .blocksize , tt .bytechange ), func (t * testing.T ) {
@@ -264,7 +263,7 @@ func TestFat32Read(t *testing.T) {
264
263
corrupted := ""
265
264
if tt .bytechange >= 0 {
266
265
b := make ([]byte , 1 )
267
- _ , _ = chacha .Read (b )
266
+ _ , _ = rand .Read (b )
268
267
_ , _ = f .WriteAt (b , tt .bytechange + pre )
269
268
corrupted = fmt .Sprintf ("corrupted %d" , tt .bytechange + pre )
270
269
}
@@ -635,16 +634,14 @@ func TestFat32OpenFile(t *testing.T) {
635
634
bWrite := make ([]byte , size )
636
635
header := fmt .Sprintf ("OpenFile(%s, %s)" , path , getOpenMode (mode ))
637
636
readWriter , err := fs .OpenFile (path , mode )
638
- seed := [32 ]byte {}
639
- chacha := rand .NewChaCha8 (seed )
640
637
switch {
641
638
case err != nil :
642
639
t .Errorf ("%s: unexpected error: %v" , header , err )
643
640
case readWriter == nil :
644
641
t .Errorf ("%s: Unexpected nil output" , header )
645
642
default :
646
643
// write and then read
647
- _ , _ = chacha .Read (bWrite )
644
+ _ , _ = rand .Read (bWrite )
648
645
written , writeErr := readWriter .Write (bWrite )
649
646
_ , _ = readWriter .Seek (0 , 0 )
650
647
bRead , readErr := io .ReadAll (readWriter )
@@ -697,16 +694,14 @@ func TestFat32OpenFile(t *testing.T) {
697
694
bWrite := make ([]byte , size )
698
695
header := fmt .Sprintf ("OpenFile(%s, %s)" , p , getOpenMode (mode ))
699
696
readWriter , err := fs .OpenFile (p , mode )
700
- seed := [32 ]byte {}
701
- chacha := rand .NewChaCha8 (seed )
702
697
switch {
703
698
case err != nil :
704
699
t .Fatalf ("%s: unexpected error: %v" , header , err )
705
700
case readWriter == nil :
706
701
t .Fatalf ("%s: Unexpected nil output" , header )
707
702
default :
708
703
// write and then read
709
- _ , _ = chacha .Read (bWrite )
704
+ _ , _ = rand .Read (bWrite )
710
705
written , writeErr := readWriter .Write (bWrite )
711
706
_ , _ = readWriter .Seek (0 , 0 )
712
707
@@ -775,9 +770,7 @@ func TestFat32OpenFile(t *testing.T) {
775
770
// success
776
771
}
777
772
778
- seed := [32 ]byte {}
779
- chacha := rand .NewChaCha8 (seed )
780
- _ , _ = chacha .Read (bWrite )
773
+ _ , _ = rand .Read (bWrite )
781
774
writeSizes := []int {512 , 1024 , 256 }
782
775
low := 0
783
776
for i := 0 ; low < len (bWrite ); i ++ {
@@ -1128,7 +1121,7 @@ func TestCreateFileTree(t *testing.T) {
1128
1121
t .Errorf ("Error making microfile %s: %v" , file , err )
1129
1122
}
1130
1123
file = path .Join (blobdir , "randfile" )
1131
- size := rand .IntN (73 ) // #nosec G404
1124
+ size := mathrandv2 .IntN (73 ) // #nosec G404
1132
1125
if err := testMkFile (fs , file , size ); err != nil {
1133
1126
t .Errorf ("Error making random file %s: %v" , file , err )
1134
1127
}
0 commit comments