From de99b5720fbb19a0c302593c654d4b0971371cc3 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Thu, 19 Jul 2018 11:37:50 -0500
Subject: [PATCH] Fix linter issues: vet

---
 Makefile              | 1 +
 ctl/import.go         | 2 +-
 gossip/gossip.go      | 6 +++---
 http/error.go         | 3 ---
 index.go              | 5 ++---
 server/server_test.go | 1 -
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 42b674e31..a3e337978 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,7 @@ gometalinter: require-gometalinter
 	    --enable=misspell \
 	    --enable=nakedret \
 	    --enable=unparam \
+	    --enable=vet \
 	    --exclude "^internal/.*\.pb\.go" \
 	    --exclude "^pql/pql.peg.go" \
 	    ./...
diff --git a/ctl/import.go b/ctl/import.go
index 9147d4664..a16913f02 100644
--- a/ctl/import.go
+++ b/ctl/import.go
@@ -59,7 +59,7 @@ type ImportCommand struct { // nolint: maligned
 	Sort bool `json:"sort"`
 
 	// Reusable client.
-	client pilosa.InternalClient `json:"-"`
+	client pilosa.InternalClient
 
 	// Standard input/output
 	*pilosa.CmdIO
diff --git a/gossip/gossip.go b/gossip/gossip.go
index 1d9e93a41..0fff2e52d 100644
--- a/gossip/gossip.go
+++ b/gossip/gossip.go
@@ -305,15 +305,15 @@ func newEventReceiver(logger *log.Logger, papi *pilosa.API) *eventReceiver {
 }
 
 func (g *eventReceiver) NotifyJoin(n *memberlist.Node) {
-	g.ch <- memberlist.NodeEvent{memberlist.NodeJoin, n}
+	g.ch <- memberlist.NodeEvent{Event: memberlist.NodeJoin, Node: n}
 }
 
 func (g *eventReceiver) NotifyLeave(n *memberlist.Node) {
-	g.ch <- memberlist.NodeEvent{memberlist.NodeLeave, n}
+	g.ch <- memberlist.NodeEvent{Event: memberlist.NodeLeave, Node: n}
 }
 
 func (g *eventReceiver) NotifyUpdate(n *memberlist.Node) {
-	g.ch <- memberlist.NodeEvent{memberlist.NodeUpdate, n}
+	g.ch <- memberlist.NodeEvent{Event: memberlist.NodeUpdate, Node: n}
 }
 
 func (g *eventReceiver) listen() {
diff --git a/http/error.go b/http/error.go
index 1a3f07c04..fdc341bae 100644
--- a/http/error.go
+++ b/http/error.go
@@ -16,9 +16,6 @@ package http
 
 // Error defines a standard application error.
 type Error struct {
-	// Machine-readable error code.
-	code string `json:"code,omitempty"`
-
 	// Human-readable message.
 	Message string `json:"message"`
 }
diff --git a/index.go b/index.go
index 1cda5e7c9..5bc409ab1 100644
--- a/index.go
+++ b/index.go
@@ -405,9 +405,8 @@ func (p indexSlice) Less(i, j int) bool { return p[i].Name() < p[j].Name() }
 
 // IndexInfo represents schema information for an index.
 type IndexInfo struct {
-	Name    string       `json:"name"`
-	options IndexOptions `json:"options"`
-	Fields  []*FieldInfo `json:"fields"`
+	Name   string       `json:"name"`
+	Fields []*FieldInfo `json:"fields"`
 }
 
 type indexInfoSlice []*IndexInfo
diff --git a/server/server_test.go b/server/server_test.go
index 506807f70..d0d3c7282 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -274,7 +274,6 @@ func TestMain_RecalculateHashes(t *testing.T) {
 	if err := client0.CreateField(context.Background(), "i", "f"); err != nil {
 		t.Fatal("create field:", err)
 	}
-	return
 
 	// Set some columns
 	data := []string{}