Skip to content

Commit

Permalink
Fix formatting makefile cmds (#1255)
Browse files Browse the repository at this point in the history
* Fix formatting makefile cmds

* Disable remaining warning emitting linters

* Delete tools-stamp (and hopefully it stays deleted)

* Fix nit
  • Loading branch information
ValarDragon authored Apr 15, 2022
1 parent eb39af7 commit 1530e4a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,5 @@ $RECYCLE.BIN/
/artifacts/
/.vscode/
/scripts/local/
/x/incentives/keeper/osmosis_testing/
/x/incentives/keeper/osmosis_testing/
tools-stamp
16 changes: 8 additions & 8 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ linters:
enable:
- asciicheck
- bidichk
- bodyclose
- contextcheck
# - bodyclose <- needs go 1.18 support
# - contextcheck <- needs go 1.18 support
# - cyclop
# - deadcode <- re-enable in another pr
# - deadcode <- re-enable in another pr
- depguard
# - dogsled <- disabled because we would like to participate in the iditerod
# - dupl <- really just catches cli stub text
Expand Down Expand Up @@ -56,26 +56,26 @@ linters:
- misspell
- nakedret
# - nestif <- ?
- nilerr
# - nilerr <- needs go 1.18 support
- nilnil
# - nlreturn <- disabled as it doesn't auto-fix something simple and doesn't add anything useful
- noctx
# - noctx <- needs go 1.18 support
# - nolintlint <- disabled because we use nolint in some places
- paralleltest
# - prealloc <- disabled because it makes simple code complicated
# - predeclared <- later
- promlinter
# - revive <- temporarily disabled while jacob figures out how to make poolId not trigger it.
- rowserrcheck
- sqlclosecheck
# - rowserrcheck <- needs go 1.18 support
# - sqlclosecheck <- needs go 1.18 support
# - staticcheck <- later
# - structcheck <- later
# - stylecheck <- enable later, atriggers on underscores in variable names and on poolId
# - tagliatelle <- disabled for defying cosmos idiom
- tenv
- testpackage
# - thelper <- later
- tparallel
# - tparallel <- needs go 1.18 support
- typecheck
- unconvert
# - unparam <- looks for unused parameters (enable later)
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,6 @@ lint:
@go run github.com/golangci/golangci-lint/cmd/golangci-lint run --timeout=10m

format:
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -name "*.pb.gw.go" -not -name "*.pb.go" | xargs gofumpt -w -s
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -name "*.pb.gw.go" -not -name "*.pb.go" | xargs misspell -w
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -name "*.pb.gw.go" -not -name "*.pb.go" | xargs goimports -w -local github.com/cosmos/cosmos-sdk
@go run github.com/golangci/golangci-lint/cmd/golangci-lint run ./... --fix

###############################################################################
Expand Down
Empty file removed tools-stamp
Empty file.

0 comments on commit 1530e4a

Please sign in to comment.