Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[build] Update linter version #3024

Merged
merged 4 commits into from
May 19, 2024
Merged

[build] Update linter version #3024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c876489
update linter
tsachiherman May 17, 2024
2273145
Update network/peer/tls_config.go
tsachiherman May 17, 2024
3b01d4c
update
tsachiherman May 17, 2024
a6d9055
skip the hash checking
tsachiherman May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
run:
timeout: 10m

# Enables skipping of directories:
# - vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
# Default: true
skip-dirs-use-default: false

# If set we pass it to "go list -mod={option}". From "go help modules":
# If invoked with -mod=readonly, the go command is disallowed from the implicit
# automatic updating of go.mod described above. Instead, it fails when any changes
Expand Down Expand Up @@ -36,6 +31,11 @@ issues:
# Default: 3
max-same-issues: 0

# Enables skipping of directories:
# - vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
# Default: true
exclude-dirs-use-default: false

linters:
disable-all: true
enable:
Expand Down
3 changes: 1 addition & 2 deletions network/peer/tls_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
// It is safe, and typically expected, for [keyLogWriter] to be [nil].
// [keyLogWriter] should only be enabled for debugging.
func TLSConfig(cert tls.Certificate, keyLogWriter io.Writer) *tls.Config {
// #nosec G402
return &tls.Config{
Certificates: []tls.Certificate{cert},
ClientAuth: tls.RequireAnyClientCert,
Expand All @@ -24,7 +23,7 @@
//
// During our security audit by Quantstamp, this was investigated
// and confirmed to be safe and correct.
InsecureSkipVerify: true,
InsecureSkipVerify: true, // #nosec G402
Dismissed Show dismissed Hide dismissed
tsachiherman marked this conversation as resolved.
Show resolved Hide resolved
MinVersion: tls.VersionTLS13,
KeyLogWriter: keyLogWriter,
}
Expand Down
4 changes: 3 additions & 1 deletion scripts/lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ fi
TESTS=${TESTS:-"golangci_lint license_header require_error_is_no_funcs_as_params single_import interface_compliance_nil require_no_error_inline_func"}

function test_golangci_lint {
go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.1
# We use the commit hash (dc2815312726b4f374f5c69a1c183a85990917a7) to reference the specific version (v1.58.1) used in our build process.
# This guarantees a known-good and verifiable version. Unlike releases, commits cannot be altered or deleted after they are made, providing a more reliable reference point for our build system.
StephenButtolph marked this conversation as resolved.
Show resolved Hide resolved
go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@dc2815312726b4f374f5c69a1c183a85990917a7
golangci-lint run --config .golangci.yml
}

Expand Down
10 changes: 8 additions & 2 deletions vms/platformvm/txs/executor/import_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ func TestNewImportTx(t *testing.T) {
require.NoError(t, err)

customAssetID := ids.GenerateTestID()

// generate a constant random source generator.
randSrc := rand.NewSource(0)
tests := []test{
{
description: "can't pay fee",
Expand All @@ -52,6 +53,7 @@ func TestNewImportTx(t *testing.T) {
map[ids.ID]uint64{
env.ctx.AVAXAssetID: env.config.TxFee - 1,
},
randSrc,
),
sourceKeys: []*secp256k1.PrivateKey{sourceKey},
expectedErr: builder.ErrInsufficientFunds,
Expand All @@ -67,6 +69,7 @@ func TestNewImportTx(t *testing.T) {
map[ids.ID]uint64{
env.ctx.AVAXAssetID: env.config.TxFee,
},
randSrc,
),
sourceKeys: []*secp256k1.PrivateKey{sourceKey},
expectedErr: nil,
Expand All @@ -82,6 +85,7 @@ func TestNewImportTx(t *testing.T) {
map[ids.ID]uint64{
env.ctx.AVAXAssetID: env.config.TxFee,
},
randSrc,
),
sourceKeys: []*secp256k1.PrivateKey{sourceKey},
timestamp: env.config.UpgradeConfig.ApricotPhase5Time,
Expand All @@ -99,6 +103,7 @@ func TestNewImportTx(t *testing.T) {
env.ctx.AVAXAssetID: env.config.TxFee,
customAssetID: 1,
},
randSrc,
),
sourceKeys: []*secp256k1.PrivateKey{sourceKey},
timestamp: env.config.UpgradeConfig.ApricotPhase5Time,
Expand Down Expand Up @@ -168,6 +173,7 @@ func fundedSharedMemory(
sourceKey *secp256k1.PrivateKey,
peerChain ids.ID,
assets map[ids.ID]uint64,
randSrc rand.Source,
) atomic.SharedMemory {
fundedSharedMemoryCalls++
m := atomic.NewMemory(prefixdb.New([]byte{fundedSharedMemoryCalls}, env.baseDB))
Expand All @@ -180,7 +186,7 @@ func fundedSharedMemory(
utxo := &avax.UTXO{
tsachiherman marked this conversation as resolved.
Show resolved Hide resolved
UTXOID: avax.UTXOID{
TxID: ids.GenerateTestID(),
OutputIndex: rand.Uint32(),
OutputIndex: uint32(randSrc.Int63()),
},
Asset: avax.Asset{ID: assetID},
Out: &secp256k1fx.TransferOutput{
Expand Down
2 changes: 2 additions & 0 deletions vms/platformvm/txs/executor/standard_tx_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package executor
import (
"errors"
"math"
"math/rand"
"testing"
"time"

Expand Down Expand Up @@ -1185,6 +1186,7 @@ func TestDurangoMemoField(t *testing.T) {
map[ids.ID]uint64{
env.ctx.AVAXAssetID: sourceAmount,
},
rand.NewSource(0),
)
env.msm.SharedMemory = sharedMemory

Expand Down
Loading