From 65eb7e89745205aa30c3bba38c377fea0f233056 Mon Sep 17 00:00:00 2001
From: Zach Ramsay <zach.ramsay@gmail.com>
Date: Thu, 21 Sep 2017 15:46:51 -0400
Subject: [PATCH] linted, somewhat

---
 Makefile              | 12 ++++++------
 circle.yml            |  1 +
 tests/test_app/app.go |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 13f5dae74..418ba3ee0 100644
--- a/Makefile
+++ b/Makefile
@@ -61,28 +61,28 @@ metalinter_test: tools
 		--enable=aligncheck \
 		--enable=deadcode \
 		--enable=gas \
+		--enable=goconst \
 		--enable=goimports \
 		--enable=gosimple \
 		--enable=gotype \
 	 	--enable=ineffassign \
+		--enable=megacheck \
 	 	--enable=misspell \
+	   	--enable=staticcheck \
 		--enable=safesql \
 	   	--enable=structcheck \
+	   	--enable=unconvert \
+		--enable=unused \
 	   	--enable=varcheck \
+		--enable=vetshadow \
 		./...
 
 		#--enable=dupl \
 		#--enable=errcheck \
-		#--enable=goconst \
 		#--enable=gocyclo \
 		#--enable=golint \ <== comments on anything exported
 	   	#--enable=interfacer \
-	   	#--enable=megacheck \
-	   	#--enable=staticcheck \
-	   	#--enable=unconvert \
 	   	#--enable=unparam \
-		#--enable=unused \
 		#--enable=vet \
-		#--enable=vetshadow \
 
 .PHONY: all build test fmt lint get_deps tools
diff --git a/circle.yml b/circle.yml
index 6355bc041..ab89e13db 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,4 +18,5 @@ checkout:
 test:
   override:
     - "go version"
+    - "cd $REPO && make metalinter_test"
     - "cd $REPO && make test_integrations"
diff --git a/tests/test_app/app.go b/tests/test_app/app.go
index 30202b6a1..11ade88cf 100644
--- a/tests/test_app/app.go
+++ b/tests/test_app/app.go
@@ -59,7 +59,7 @@ func commit(client abcicli.Client, hashExp []byte) {
 	res := client.CommitSync()
 	_, data, log := res.Code, res.Data, res.Log
 	if res.IsErr() {
-		panic(fmt.Sprintf("committing %v\nlog: %v", log))
+		panic(fmt.Sprintf("committing %v\nlog: %v", log, res.Log))
 	}
 	if !bytes.Equal(res.Data, hashExp) {
 		panic(fmt.Sprintf("Commit hash was unexpected. Got %X expected %X",