Skip to content

Commit

Permalink
Linting and dependency updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdee committed Aug 7, 2023
1 parent b9b416c commit 80c2b7e
Show file tree
Hide file tree
Showing 10 changed files with 281 additions and 106 deletions.
151 changes: 151 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
# This file contains all available configuration options
# with their default values (in comments).
#
# This file is not a configuration example,
# it contains the exhaustive configuration with explanations of the options.

# Options for analysis running.
run:
# The default concurrency value is the number of available CPU.
# concurrency: 4

# Timeout for analysis, e.g. 30s, 5m.
# Default: 1m
timeout: 10m

# Exit code when at least one issue was found.
# Default: 1
# issues-exit-code: 2

# Include test files or not.
# Default: true
tests: false

# List of build tags, all linters use it.
# Default: [].
# build-tags:
# - mytag

# Which dirs to skip: issues from them won't be reported.
# Can use regexp here: `generated.*`, regexp is applied on full path.
# Default value is empty list,
# but default dirs are skipped independently of this option's value (see skip-dirs-use-default).
# "/" will be replaced by current OS file path separator to properly work on Windows.
# skip-dirs:
# - autogenerated_by_my_lib

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

# 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.
# "/" will be replaced by current OS file path separator to properly work on Windows.
skip-files:
- ".*_ssz\\.go$"

# 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
# to go.mod are needed. This setting is most useful to check that go.mod does
# not need updates, such as in a continuous integration and testing system.
# If invoked with -mod=vendor, the go command assumes that the vendor
# directory holds the correct copies of dependencies and ignores
# the dependency descriptions in go.mod.
#
# Allowed values: readonly|vendor|mod
# By default, it isn't set.
modules-download-mode: readonly

# Allow multiple parallel golangci-lint instances running.
# If false (default) - golangci-lint acquires file lock on start.
allow-parallel-runners: true

# Define the Go version limit.
# Mainly related to generics support since go1.18.
# Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.18
go: '1.19'


# output configuration options
output:
# Format: colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions
#
# Multiple can be specified by separating them by comma, output can be provided
# for each of them by separating format name and path by colon symbol.
# Output path can be either `stdout`, `stderr` or path to the file to write to.
# Example: "checkstyle:report.json,colored-line-number"
#
# Default: colored-line-number
# format: json

# Print lines of code with issue.
# Default: true
# print-issued-lines: false

# Print linter name in the end of issue text.
# Default: true
# print-linter-name: false

# Make issues output unique by line.
# Default: true
# uniq-by-line: false

# Add a prefix to the output file references.
# Default is no prefix.
# path-prefix: ""

# Sort results by: filepath, line and column.
# sort-results: true


# All available settings of specific linters.
linters-settings:
lll:
line-length: 132

stylecheck:
checks: [ "all", "-ST1000" ]

tagliatelle:
case:
# use-field-name: true
rules:
json: snake
yaml: snake

nlreturn:
# Allow two-line blocks without requiring a newline
block-size: 3

linters:
# Enable all available linters.
# Default: false
enable-all: true
# Disable specific linter
# https://golangci-lint.run/usage/linters/#disabled-by-default
disable:
- deadcode
- depguard
- exhaustivestruct
- exhaustruct
- gochecknoglobals
- gochecknoinits
- goerr113
- golint
- gomnd
- ifshort
- interfacer
- ireturn
- maligned
- nosnakecase
- scopelint
- structcheck
- varcheck
- varnamelen
- wrapcheck
- wsl
1 change: 1 addition & 0 deletions encryptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func UseEncryptor(e wtypes.Encryptor) error {
return errors.New("no encryptor supplied")
}
encryptor = e

return nil
}

Expand Down
7 changes: 7 additions & 0 deletions encryptor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/stretchr/testify/require"
wallet "github.com/wealdtech/go-eth2-wallet"
keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4"
unencrypted "github.com/wealdtech/go-eth2-wallet-encryptor-unencrypted"
)

Expand All @@ -33,4 +34,10 @@ func TestEncryptor(t *testing.T) {

// Confirm the encryptor has been set.
require.Equal(t, "unencrypted", wallet.GetEncryptor())

// Attempt to set a different encryptor.
require.NoError(t, wallet.UseEncryptor(keystorev4.New()))

// Confirm the encryptor has been set.
require.Equal(t, "keystore", wallet.GetEncryptor())
}
44 changes: 22 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,40 @@ go 1.20

require (
github.com/google/uuid v1.3.0
github.com/stretchr/testify v1.8.2
github.com/wealdtech/go-ecodec v1.1.3
github.com/wealdtech/go-eth2-types/v2 v2.8.1
github.com/wealdtech/go-eth2-wallet-distributed v1.1.5
github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.3.1
github.com/wealdtech/go-eth2-wallet-encryptor-unencrypted v1.0.1
github.com/wealdtech/go-eth2-wallet-hd/v2 v2.6.1
github.com/wealdtech/go-eth2-wallet-nd/v2 v2.4.1
github.com/wealdtech/go-eth2-wallet-store-filesystem v1.17.1
github.com/wealdtech/go-eth2-wallet-store-s3 v1.11.3
github.com/wealdtech/go-eth2-wallet-store-scratch v1.7.1
github.com/wealdtech/go-eth2-wallet-types/v2 v2.10.1
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
github.com/wealdtech/go-ecodec v1.1.4
github.com/wealdtech/go-eth2-types/v2 v2.8.2
github.com/wealdtech/go-eth2-wallet-distributed v1.2.1
github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.4.1
github.com/wealdtech/go-eth2-wallet-encryptor-unencrypted v1.0.2
github.com/wealdtech/go-eth2-wallet-hd/v2 v2.7.0
github.com/wealdtech/go-eth2-wallet-nd/v2 v2.5.0
github.com/wealdtech/go-eth2-wallet-store-filesystem v1.18.1
github.com/wealdtech/go-eth2-wallet-store-s3 v1.12.0
github.com/wealdtech/go-eth2-wallet-store-scratch v1.7.2
github.com/wealdtech/go-eth2-wallet-types/v2 v2.11.0
gotest.tools v2.2.0+incompatible
)

require (
github.com/aws/aws-sdk-go v1.44.213 // indirect
github.com/aws/aws-sdk-go v1.44.312 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ferranbt/fastssz v0.1.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/herumi/bls-eth-go-binary v1.29.1 // indirect
github.com/herumi/bls-eth-go-binary v1.31.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 // indirect
github.com/wealdtech/go-bytesutil v1.2.1 // indirect
github.com/wealdtech/go-eth2-util v1.8.1 // indirect
github.com/wealdtech/go-indexer v1.0.1 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
github.com/wealdtech/go-eth2-util v1.8.2 // indirect
github.com/wealdtech/go-indexer v1.1.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 80c2b7e

Please sign in to comment.