use math/rand/v2 (#4020)

This commit is contained in:
fatedier 2024-03-20 15:48:31 +08:00 committed by GitHub
parent c08be0fd92
commit b36f3834eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 25 deletions

View File

@ -23,7 +23,7 @@ jobs:
uses: golangci/golangci-lint-action@v4
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.56
version: v1.57
# Optional: golangci-lint command line arguments.
# args: --issues-exit-code=0

View File

@ -1,5 +1,5 @@
service:
golangci-lint-version: 1.56.x # use the fixed version to not introduce new linters unexpectedly
golangci-lint-version: 1.57.x # use the fixed version to not introduce new linters unexpectedly
run:
concurrency: 4
@ -8,23 +8,6 @@ run:
build-tags:
- integ
- integfuzz
# which dirs to skip: they won't be analyzed;
# can use regexp here: generated.*, regexp is applied on full path;
# default value is empty list, but next dirs are always skipped independently
# from this option's value:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
skip-dirs:
- genfiles$
- vendor$
- bin$
# which files to skip: they will be analyzed, but issues from them
# won't be reported. Default value is empty list, but there is
# no need to include all autogenerated files, we confidently recognize
# autogenerated files. If it's not please let us know.
skip-files:
- ".*\\.pb\\.go"
- ".*\\.gen\\.go"
linters:
disable-all: true
@ -136,6 +119,14 @@ issues:
- unparam
text: "is always false"
exclude-dirs:
- genfiles$
- vendor$
- bin$
exclude-files:
- ".*\\.pb\\.go"
- ".*\\.gen\\.go"
# Independently from option `exclude` we use default exclude patterns,
# it can be disabled by this option. To list all
# excluded by default patterns execute `golangci-lint run --help`.

View File

@ -17,7 +17,7 @@ package nathole
import (
"context"
"fmt"
"math/rand"
"math/rand/v2"
"net"
"slices"
"strconv"
@ -341,7 +341,7 @@ func sendSidMessage(
TransactionID: transactionID,
Sid: sid,
Response: false,
Nonce: strings.Repeat("0", rand.Intn(20)),
Nonce: strings.Repeat("0", rand.IntN(20)),
}
buf, err := EncodeMessage(m, key)
if err != nil {
@ -398,7 +398,7 @@ func sendSidMessageToRandomPorts(
used := sets.New[int]()
getUnusedPort := func() int {
for i := 0; i < 10; i++ {
port := rand.Intn(65535-1024) + 1024
port := rand.IntN(65535-1024) + 1024
if !used.Has(port) {
used.Insert(port)
return port

View File

@ -20,7 +20,7 @@ import (
"crypto/subtle"
"encoding/hex"
"fmt"
mathrand "math/rand"
mathrand "math/rand/v2"
"net"
"strconv"
"strings"
@ -124,7 +124,7 @@ func RandomSleep(duration time.Duration, minRatio, maxRatio float64) time.Durati
if max <= min {
n = min
} else {
n = mathrand.Int63n(max-min) + min
n = mathrand.Int64N(max-min) + min
}
d := duration * time.Duration(n) / time.Duration(1000)
time.Sleep(d)

View File

@ -15,7 +15,7 @@
package wait
import (
"math/rand"
"math/rand/v2"
"time"
"github.com/fatedier/frp/pkg/util/util"