Skip to content

Commit

Permalink
Address linter issues
Browse files Browse the repository at this point in the history
Changes (align with the main branch):
- remove rand.Seed(s)
- use rand.Read from "crypto/rand"
- add //nolint:all for (*reflect.SliceHeader)(slice) -> will fix in a 
follow-up PR

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
Co-authored-by: Iván Valdés Castillo <iv@nvald.es>
  • Loading branch information
henrybear327 and ivanvc committed Apr 5, 2024
1 parent 0b59bc1 commit 9b60c13
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 13 deletions.
7 changes: 0 additions & 7 deletions cmd/bbolt/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package main_test
import (
"bytes"
crypto "crypto/rand"
"encoding/binary"
"fmt"
"io"
"math/rand"
Expand Down Expand Up @@ -304,12 +303,6 @@ func NewMain() *Main {
}

func TestCompactCommand_Run(t *testing.T) {
var s int64
if err := binary.Read(crypto.Reader, binary.BigEndian, &s); err != nil {
t.Fatal(err)
}
rand.Seed(s)

dstdb := btesting.MustCreateDB(t)
dstdb.Close()

Expand Down
1 change: 0 additions & 1 deletion freelist_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ func benchmark_FreelistRelease(b *testing.B, size int) {
}

func randomPgids(n int) []pgid {
rand.Seed(42)
pgids := make(pgids, n)
for i := range pgids {
pgids[i] = pgid(rand.Int63())
Expand Down
6 changes: 4 additions & 2 deletions manydbs_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package bbolt

import (
"crypto/rand"
"fmt"
"math/rand"
"os"
"path/filepath"
"testing"
Expand Down Expand Up @@ -46,7 +46,9 @@ func createAndPutKeys(t *testing.T) {
}

var key [16]byte
rand.Read(key[:])
if _, err := rand.Read(key[:]); err != nil {
return err
}
if err := nodes.Put(key[:], nil); err != nil {
return err
}
Expand Down
2 changes: 0 additions & 2 deletions simulation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ func testSimulate(t *testing.T, openOption *bolt.Options, round, threadCount, pa
t.Skip("skipping test in short mode.")
}

rand.Seed(int64(qseed))

// A list of operations that readers and writers can perform.
var readerHandlers = []simulateHandler{simulateGetHandler}
var writerHandlers = []simulateHandler{simulateGetHandler, simulatePutHandler}
Expand Down
2 changes: 1 addition & 1 deletion unsafe.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func unsafeByteSlice(base unsafe.Pointer, offset uintptr, i, j int) []byte {
// manipulation of reflect.SliceHeader to prevent misuse, namely, converting
// from reflect.SliceHeader to a Go slice type.
func unsafeSlice(slice, data unsafe.Pointer, len int) {
s := (*reflect.SliceHeader)(slice)
s := (*reflect.SliceHeader)(slice) //nolint:staticcheck
s.Data = uintptr(data)
s.Cap = len
s.Len = len
Expand Down

0 comments on commit 9b60c13

Please sign in to comment.