From 97817404c9a10c7018a999e2a1f1b81f33082abc Mon Sep 17 00:00:00 2001
From: Manjunath A Kumatagi <mkumatag@in.ibm.com>
Date: Thu, 25 Jan 2018 04:50:40 -0500
Subject: [PATCH] integration: Fix govet errors

---
 integration/metrics_test.go |  4 ++--
 integration/v3_grpc_test.go | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/integration/metrics_test.go b/integration/metrics_test.go
index bd7850cf2..a76563d7e 100644
--- a/integration/metrics_test.go
+++ b/integration/metrics_test.go
@@ -75,8 +75,8 @@ func TestMetricDbSizeDefrag(t *testing.T) {
 
 	// clear out historical keys
 	creq := &pb.CompactionRequest{Revision: int64(numPuts), Physical: true}
-	if _, err := kvc.Compact(context.TODO(), creq); err != nil {
-		t.Fatal(err)
+	if _, kerr := kvc.Compact(context.TODO(), creq); kerr != nil {
+		t.Fatal(kerr)
 	}
 
 	// defrag should give freed space back to fs
diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go
index c6e4a3d16..4d1c9d811 100644
--- a/integration/v3_grpc_test.go
+++ b/integration/v3_grpc_test.go
@@ -166,7 +166,7 @@ func TestV3HashKV(t *testing.T) {
 		}
 
 		rev := resp.Header.Revision
-		hresp, err := mvc.HashKV(context.Background(), &pb.HashKVRequest{0})
+		hresp, err := mvc.HashKV(context.Background(), &pb.HashKVRequest{Revision: 0})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -177,7 +177,7 @@ func TestV3HashKV(t *testing.T) {
 		prevHash := hresp.Hash
 		prevCompactRev := hresp.CompactRevision
 		for i := 0; i < 10; i++ {
-			hresp, err := mvc.HashKV(context.Background(), &pb.HashKVRequest{0})
+			hresp, err := mvc.HashKV(context.Background(), &pb.HashKVRequest{Revision: 0})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -519,7 +519,7 @@ func TestV3TxnRangeCompare(t *testing.T) {
 				RangeEnd:    []byte{0},
 				Target:      pb.Compare_CREATE,
 				Result:      pb.Compare_LESS,
-				TargetUnion: &pb.Compare_CreateRevision{6},
+				TargetUnion: &pb.Compare_CreateRevision{CreateRevision: 6},
 			},
 			true,
 		},
@@ -530,7 +530,7 @@ func TestV3TxnRangeCompare(t *testing.T) {
 				RangeEnd:    []byte{0},
 				Target:      pb.Compare_CREATE,
 				Result:      pb.Compare_LESS,
-				TargetUnion: &pb.Compare_CreateRevision{5},
+				TargetUnion: &pb.Compare_CreateRevision{CreateRevision: 5},
 			},
 			false,
 		},
@@ -541,7 +541,7 @@ func TestV3TxnRangeCompare(t *testing.T) {
 				RangeEnd:    []byte("/a0"),
 				Target:      pb.Compare_CREATE,
 				Result:      pb.Compare_LESS,
-				TargetUnion: &pb.Compare_CreateRevision{5},
+				TargetUnion: &pb.Compare_CreateRevision{CreateRevision: 5},
 			},
 			true,
 		},
@@ -552,7 +552,7 @@ func TestV3TxnRangeCompare(t *testing.T) {
 				RangeEnd:    []byte("/a0"),
 				Target:      pb.Compare_CREATE,
 				Result:      pb.Compare_LESS,
-				TargetUnion: &pb.Compare_CreateRevision{4},
+				TargetUnion: &pb.Compare_CreateRevision{CreateRevision: 4},
 			},
 			false,
 		},
@@ -563,7 +563,7 @@ func TestV3TxnRangeCompare(t *testing.T) {
 				RangeEnd:    []byte("/b0"),
 				Target:      pb.Compare_VALUE,
 				Result:      pb.Compare_EQUAL,
-				TargetUnion: &pb.Compare_Value{[]byte("x")},
+				TargetUnion: &pb.Compare_Value{Value: []byte("x")},
 			},
 			false,
 		},
@@ -574,7 +574,7 @@ func TestV3TxnRangeCompare(t *testing.T) {
 				RangeEnd:    []byte("/a0"),
 				Target:      pb.Compare_LEASE,
 				Result:      pb.Compare_GREATER,
-				TargetUnion: &pb.Compare_Lease{0},
+				TargetUnion: &pb.Compare_Lease{Lease: 0},
 			},
 			false,
 		},
@@ -585,7 +585,7 @@ func TestV3TxnRangeCompare(t *testing.T) {
 				RangeEnd:    []byte("/a0"),
 				Target:      pb.Compare_LEASE,
 				Result:      pb.Compare_EQUAL,
-				TargetUnion: &pb.Compare_Lease{0},
+				TargetUnion: &pb.Compare_Lease{Lease: 0},
 			},
 			true,
 		},