From e36eb6c2a10684786b1d88f480020918e4713d4a Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Thu, 16 Nov 2023 09:16:56 +0100 Subject: [PATCH] Add `golangci-lint run` to `lib/` (#181) * [lib] Add .golangci.yaml as symlink https://github.com/golang/go/wiki/Modules#faqs--multi-module-repositories * [golangci-lint] Change `nakedret` settings * [linter] Can be replaced with faster hex.EncodeToString (perfsprint) * [linter] Fix too many quotes * [ci] Add `golangci-lint run` of `lib/` Signed-off-by: Julian Strobl --- .github/workflows/audit.yaml | 2 +- .golangci.yaml | 3 +++ lib/.golangci.yaml | 1 + lib/config.go | 2 +- lib/tx.go | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 120000 lib/.golangci.yaml diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index 1d37bf6..defbda2 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -56,7 +56,7 @@ jobs: run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest - name: Run golangci-lint - run: golangci-lint run + run: (golangci-lint run && cd lib && golangci-lint run) - name: Run tests run: go test -race -vet=off ./... diff --git a/.golangci.yaml b/.golangci.yaml index d37b646..eb60b6b 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -66,6 +66,9 @@ linters: - usestdlibvars - wastedassign - zerologlint +linters-settings: + nakedret: + max-func-lines: 100 issues: exclude-rules: - path: codec\.go diff --git a/lib/.golangci.yaml b/lib/.golangci.yaml new file mode 120000 index 0000000..a9c064e --- /dev/null +++ b/lib/.golangci.yaml @@ -0,0 +1 @@ +../.golangci.yaml \ No newline at end of file diff --git a/lib/config.go b/lib/config.go index edad3fa..a1e8b9b 100644 --- a/lib/config.go +++ b/lib/config.go @@ -10,7 +10,7 @@ import ( // Config defines library top level configuration. type Config struct { ChainID string `mapstructure:"chain-id" json:"chain-id"` - EncodingConfig params.EncodingConfig `mapstructure:"encoding-config" json:"encoding-config""` + EncodingConfig params.EncodingConfig `mapstructure:"encoding-config" json:"encoding-config"` RootDir string `mapstructure:"root-dir" json:"root-dir"` RPCEndpoint string `mapstructure:"rpc-endpoint" json:"rpc-endpoint"` } diff --git a/lib/tx.go b/lib/tx.go index 8c0ce17..8e46617 100644 --- a/lib/tx.go +++ b/lib/tx.go @@ -50,7 +50,7 @@ func getKeyPairFromKeyring(address sdk.AccAddress) (keyPair KeyPair, err error) return } - name := fmt.Sprintf("%x", []byte(address)) + ".address" + name := hex.EncodeToString([]byte(address)) + ".address" i, err := ring.Get(name) if err != nil { return