Remove gofumpt from required lints, directly use it in make format (#…

…1318) ## What is the purpose of the change Closes: #1309 , context is in the issue. TL;DR, remove gofumpt from being required in CI due to barriers to entry / lack of ease of use with default IDE setups. Its kept in make format, and make format is intended to be ran pre-releases ## Brief change log Remove gofumpt from being required. ## Testing and Verifying This change is a trivial rework / code cleanup without any test coverage. ## Documentation and Release Note - Does this pull request introduce a new feature or user-facing behavior changes? yes - Is a relevant changelog entry added to the `Unreleased` section in `CHANGELOG.md`? No -- This is not done, as gofumpt was also added in unreleased code, so this is no net change - How is the feature or change documented? N/A
osmosis-labs · Apr 23, 2022 · ed10116 · ed10116
1 parent c8725e9
commit ed10116
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -38,7 +38,7 @@ linters:
     #    - godox <- detects TODO/BUG/FIXME and we may wantnthis later but isn't appropriate now
     #    - goerr113 <- disabled due to lack of comprehension
     - gofmt
-    - gofumpt
+    # - gofumpt <- disabled https://github.com/osmosis-labs/osmosis/issues/1309
     - goheader
     - goimports
     #    - gomoddirectives <- disables replaces

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "tabnine.experimentalAutoImports": true,
   "go.lintTool": "golangci-lint",
-  "go.formatTool": "gofumports",
+  "go.formatTool": "goimports",
   "go.useLanguageServer": true,
   "[go.mod]": {
     "editor.formatOnSave": true,

diff --git a/Makefile b/Makefile
@@ -258,6 +258,7 @@ lint:
 
 format:
 	@go run github.com/golangci/golangci-lint/cmd/golangci-lint run ./... --fix
+	@go run mvdan.cc/gofumpt -l -w .
 
 ###############################################################################
 ###                                Localnet                                 ###

diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go
@@ -91,6 +91,5 @@ func (suite *KeeperTestSuite) TestHooksPanicRecovery() {
 				suite.Require().Equal(tc.expectedCounterValues[i], epochHook.successCounter, "test case index %d", tcIndex)
 			}
 		}
-
 	}
 }
diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go
@@ -140,7 +140,6 @@ func (suite *KeeperTestSuite) TestGRPCActiveGaugesPerDenom() {
 		StartTime:         startTime,
 	}
 	suite.Require().Equal(res.Data[0].String(), expectedGauge.String())
-
 }
 
 func (suite *KeeperTestSuite) TestGRPCUpcomingGauges() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,6 +91,5 @@ func (suite *KeeperTestSuite) TestHooksPanicRecovery() { @@
     				suite.Require().Equal(tc.expectedCounterValues[i], epochHook.successCounter, "test case index %d", tcIndex)
     			}
     		}
     	}
     }