certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #2228: tools: Remove gocyclo

This commit is contained in:
Christopher Goes 2018-09-04 14:30:41 +02:00 committed by GitHub
parent 1039388207 bb7b2ca0bb
commit d736204760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PENDING.md
View File

@ -35,6 +35,7 @@ BREAKING CHANGES
* [x/slashing] [#2122](https://github.com/cosmos/cosmos-sdk/pull/2122) - Implement slashing period * [x/slashing] [#2122](https://github.com/cosmos/cosmos-sdk/pull/2122) - Implement slashing period
* [types] \#2119 Parsed error messages and ABCI log errors to make them more human readable. * [types] \#2119 Parsed error messages and ABCI log errors to make them more human readable.
* [simulation] Rename TestAndRunTx to Operation [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153) * [simulation] Rename TestAndRunTx to Operation [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153)
* [tools] Removed gocyclo [#2211](https://github.com/cosmos/cosmos-sdk/issues/2211)
* [baseapp] Remove `SetTxDecoder` in favor of requiring the decoder be set in baseapp initialization. [#1441](https://github.com/cosmos/cosmos-sdk/issues/1441) * [baseapp] Remove `SetTxDecoder` in favor of requiring the decoder be set in baseapp initialization. [#1441](https://github.com/cosmos/cosmos-sdk/issues/1441)
* Tendermint * Tendermint

18
tools/Makefile
View File

@ -22,7 +22,7 @@ INEFFASSIGN_CHECK := $(shell command -v ineffassign 2> /dev/null)
MISSPELL_CHECK := $(shell command -v misspell 2> /dev/null) MISSPELL_CHECK := $(shell command -v misspell 2> /dev/null)
ERRCHECK_CHECK := $(shell command -v errcheck 2> /dev/null) ERRCHECK_CHECK := $(shell command -v errcheck 2> /dev/null)
UNPARAM_CHECK := $(shell command -v unparam 2> /dev/null) UNPARAM_CHECK := $(shell command -v unparam 2> /dev/null)
GOCYCLO_CHECK := $(shell command -v gocyclo 2> /dev/null) # GOCYCLO_CHECK := $(shell command -v gocyclo 2> /dev/null)
check_tools: check_tools:
ifndef DEP_CHECK ifndef DEP_CHECK
@ -126,12 +126,12 @@ else
@echo "Installing unparam" @echo "Installing unparam"
go get -v $(UNPARAM) go get -v $(UNPARAM)
endif endif
ifdef GOCYCLO_CHECK # ifdef GOCYCLO_CHECK
@echo "gocyclo is already installed. Run 'make update_tools' to update." # @echo "gocyclo is already installed. Run 'make update_tools' to update."
else # else
@echo "Installing gocyclo" # @echo "Installing gocyclo"
go get -v $(GOCYCLO) # go get -v $(GOCYCLO)
endif # endif
update_tools: update_tools:
@echo "Updating dep" @echo "Updating dep"
@ -153,8 +153,8 @@ update_dev_tools:
go get -u -v $(ERRCHECK) go get -u -v $(ERRCHECK)
@echo "Updating unparam" @echo "Updating unparam"
go get -u -v $(UNPARAM) go get -u -v $(UNPARAM)
@echo "Updating goyclo" # @echo "Updating goyclo"
go get -u -v $(GOCYCLO) # go get -u -v $(GOCYCLO)
# To avoid unintended conflicts with file names, always add to .PHONY # To avoid unintended conflicts with file names, always add to .PHONY
# unless there is a reason not to. # unless there is a reason not to.

2
tools/gometalinter.json
View File

@ -2,7 +2,7 @@
"Linters": { "Linters": {
"vet": "go tool vet -composites=false :PATH:LINE:MESSAGE" "vet": "go tool vet -composites=false :PATH:LINE:MESSAGE"
}, },
"Enable": ["golint", "vet", "ineffassign", "unparam", "unconvert", "misspell", "gocyclo"], "Enable": ["golint", "vet", "ineffassign", "unparam", "unconvert", "misspell"],
"Deadline": "500s", "Deadline": "500s",
"Vendor": true, "Vendor": true,
"Cyclo": 11 "Cyclo": 11