diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2e31c3f6..540a09a7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.3 + go-version: 1.21.6 check-latest: true - uses: golangci/golangci-lint-action@v3 with: diff --git a/Makefile b/Makefile index cd7c4c90..5e0519ef 100644 --- a/Makefile +++ b/Makefile @@ -146,11 +146,8 @@ fmt: ### Linting ### ############################################################################### -golangci_version=v1.61.0 - lint-install: - @echo "--> Installing golangci-lint $(golangci_version)" - @go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version) + @go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest lint: @echo "--> Running linter" diff --git a/x/vesting/keeper/msg_server.go b/x/vesting/keeper/msg_server.go index 78cf1811..59acaaff 100644 --- a/x/vesting/keeper/msg_server.go +++ b/x/vesting/keeper/msg_server.go @@ -258,7 +258,7 @@ func (m msgServer) Clawback(goCtx context.Context, msg *types.MsgClawback) (*typ // coinsMin returns the minimum of its inputs for all denominations. func coinsMin(a, b sdk.Coins) sdk.Coins { - min := sdk.NewCoins() + minCoins := sdk.NewCoins() for _, coinA := range a { denom := coinA.Denom bAmt := b.AmountOfNoDenomValidation(denom) @@ -267,8 +267,8 @@ func coinsMin(a, b sdk.Coins) sdk.Coins { minAmt = bAmt } if minAmt.IsPositive() { - min = min.Add(sdk.NewCoin(denom, minAmt)) + minCoins = minCoins.Add(sdk.NewCoin(denom, minAmt)) } } - return min + return minCoins }