Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
12 changes: 7 additions & 5 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ name: golangci-lint
on:
push:
branches:
- master
- master
pull_request:

permissions:
contents: read
pull-requests: read

jobs:
golangci:
Expand All @@ -15,10 +16,11 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "^1.22"
cache: false
go-version: '1.22.4'
- uses: actions/checkout@v4
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v8
with:
version: latest
args: --timeout=60m
only-new-issues: true
args: --timeout=10m
198 changes: 68 additions & 130 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,149 +1,87 @@
# 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.

issues:
# 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.
exclude-files:
- ".*_ssz\\.go$"

# Options for analysis running.
version: "2"
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

# 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.
tests: false
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.21'


# 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
default: all
disable:
- cyclop
- depguard
- dupl
- err113
- execinquery
- exhaustruct
- exportloopref
- funlen
- gochecknoglobals
- gocognit
- gomnd
- ireturn
- lll
- mnd
- perfsprint
- varnamelen
- wsl
- maintidx
- noinlineerr
settings:
lll:
line-length: 132
nlreturn:
block-size: 3
staticcheck:
checks:
- all
- -ST1000
tagliatelle:
case:
rules:
json: snake
yaml: snake
wsl_v5:
disable:
- assign
- branch
- decl
- defer
- expr
- for
- go
- if
- inc-dec
- label
- range
- return
- select
- send
- switch
- type-switch
- append
- assign-exclusive
- assign-expr
- err
- leading-whitespace
- trailing-whitespace
exclusions:
generated: lax
presets:
- comments
- common-false-positives
- legacy
- std-error-handling
paths:
- .*_ssz\.go$
- third_party$
- builtin$
- examples$
formatters:
enable:
- gci
- gofmt
- gofumpt
- goimports
exclusions:
generated: lax
paths:
- .*_ssz\.go$
- third_party$
- builtin$
- examples$
14 changes: 8 additions & 6 deletions account.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ import (
)

type account struct {
wallet *wallet
id uuid.UUID
name string
pubKey e2types.PublicKey
version uint
mutex *sync.RWMutex
wallet *wallet
id uuid.UUID
name string
pubKey e2types.PublicKey
version uint
mutex *sync.RWMutex
endpoint *Endpoint
}

func newAccount(wallet *wallet,
Expand Down Expand Up @@ -84,6 +85,7 @@ func (a *account) Unlock(ctx context.Context, passphrase []byte) error {
if err != nil {
return errors.Wrap(err, "failed attempt to unlock account")
}

if !unlocked {
return errors.New("unlock attempt failed")
}
Expand Down
7 changes: 7 additions & 0 deletions connectionprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ func (c *PuddleConnectionProvider) Connection(ctx context.Context, endpoint *End

func (c *PuddleConnectionProvider) obtainOrCreatePool(address string) *puddle.Pool[*grpc.ClientConn] {
connectionPoolsMu.RLock()

pool, exists := connectionPools[address]

connectionPoolsMu.RUnlock()

if !exists {
constructor := func(_ context.Context) (*grpc.ClientConn, error) {
conn, err := grpc.NewClient(address, []grpc.DialOption{
Expand All @@ -77,6 +80,7 @@ func (c *PuddleConnectionProvider) obtainOrCreatePool(address string) *puddle.Po
if err != nil {
return nil, errors.Wrap(err, "failed to construct connection")
}

incConnections(address)

return conn, nil
Expand All @@ -92,8 +96,11 @@ func (c *PuddleConnectionProvider) obtainOrCreatePool(address string) *puddle.Po
Destructor: destructor,
MaxSize: c.poolConnections,
})

connectionPoolsMu.Lock()

connectionPools[address] = pool

connectionPoolsMu.Unlock()
}

Expand Down
2 changes: 2 additions & 0 deletions distributedaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type distributedAccount struct {
participantConns map[uint64]*grpc.ClientConn
version uint
mutex *sync.RWMutex
endpoint *Endpoint
}

func newDistributedAccount(wallet *wallet,
Expand Down Expand Up @@ -117,6 +118,7 @@ func (a *distributedAccount) Unlock(ctx context.Context, passphrase []byte) erro
if err != nil {
return errors.Wrap(err, "failed attempt to unlock account")
}

if !unlocked {
return errors.New("unlock attempt failed")
}
Expand Down
Loading