From 9b26ccfa76e1a100ba5cb12f46ed48ae03a78881 Mon Sep 17 00:00:00 2001
From: ValarDragon <dojha12@gmail.com>
Date: Mon, 3 Sep 2018 21:29:59 -0700
Subject: [PATCH] tools: Remove gocyclo

We can investigate re-introducing our own fork #postlaunch.
Closes #2211
---
 PENDING.md              |  1 +
 tools/Makefile          | 18 +++++++++---------
 tools/gometalinter.json |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/PENDING.md b/PENDING.md
index 17616ced1..dd663564a 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -35,6 +35,7 @@ BREAKING CHANGES
     * [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.
     * [simulation] Rename TestAndRunTx to Operation [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153)
+    * [tools] Removed golint [#2211](https://github.com/cosmos/cosmos-sdk/issues/2211)
 
 * Tendermint
 
diff --git a/tools/Makefile b/tools/Makefile
index a11f2ec70..87544107c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,7 +22,7 @@ INEFFASSIGN_CHECK := $(shell command -v ineffassign 2> /dev/null)
 MISSPELL_CHECK := $(shell command -v misspell 2> /dev/null)
 ERRCHECK_CHECK := $(shell command -v errcheck 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:
 ifndef DEP_CHECK
@@ -126,12 +126,12 @@ else
 	@echo "Installing unparam"
 	go get -v $(UNPARAM)
 endif
-ifdef GOCYCLO_CHECK
-	@echo "gocyclo is already installed.  Run 'make update_tools' to update."
-else
-	@echo "Installing gocyclo"
-	go get -v $(GOCYCLO)
-endif
+# ifdef GOCYCLO_CHECK
+# 	@echo "gocyclo is already installed.  Run 'make update_tools' to update."
+# else
+# 	@echo "Installing gocyclo"
+# 	go get -v $(GOCYCLO)
+# endif
 
 update_tools:
 	@echo "Updating dep"
@@ -153,8 +153,8 @@ update_dev_tools:
 	go get -u -v $(ERRCHECK)
 	@echo "Updating unparam"
 	go get -u -v $(UNPARAM)
-	@echo "Updating goyclo"
-	go get -u -v $(GOCYCLO)
+	# @echo "Updating goyclo"
+	# go get -u -v $(GOCYCLO)
 
 # To avoid unintended conflicts with file names, always add to .PHONY
 # unless there is a reason not to.
diff --git a/tools/gometalinter.json b/tools/gometalinter.json
index 124e28c14..42788714b 100644
--- a/tools/gometalinter.json
+++ b/tools/gometalinter.json
@@ -2,7 +2,7 @@
     "Linters": {
         "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",
     "Vendor": true,
     "Cyclo": 11