From 98e4a0506855ce3ccca2a3c113d527a6a16774b1 Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Tue, 12 Sep 2017 03:41:10 -0700
Subject: [PATCH 1/2] test: check for inconsistent receiver names

---
 test | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test b/test
index 1292af131..e49d30684 100755
--- a/test
+++ b/test
@@ -397,6 +397,19 @@ function fmt_pass {
 		exit 255
 	fi
 
+	echo "Checking receiver names..."
+	recvs=$(grep 'func ([^*]' {*,*/*,*/*/*}.go  | grep -Ev "(generated|pb/)" | tr  ':' ' ' |  \
+		awk ' { print $2" "$3" "$4" "$1 }' | sed "s/[a-zA-Z\.]*go//g" |  sort  | uniq  | \
+		grep -Ev  "(Descriptor|Proto|_)"  | awk ' { print $3" "$4 } ' | sort | uniq -c | grep -v ' 1 ' | awk ' { print $2 } ')
+	if [ -n "${recvs}" ]; then
+		recvs=($recvs)
+		for recv in "${recvs[@]}"; do
+			echo "Mismatched receiver for $recv..."
+			grep "$recv" "${FMT[@]}" | grep 'func ('
+		done
+		exit 255
+	fi
+
 	echo "Checking commit titles..."
 	git log --oneline "$(git merge-base HEAD master)"...HEAD | while read -r l; do
 		commitMsg=$(echo "$l" | cut -f2- -d' ')

From 4fa1dd196cb6ef4a348eb78431d2cb61c2803f8c Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Tue, 12 Sep 2017 03:41:40 -0700
Subject: [PATCH 2/2] *: make receiver names consistent

---
 clientv3/concurrency/election.go |  2 +-
 clientv3/namespace/kv.go         |  4 ++--
 mvcc/index.go                    |  6 +++---
 pkg/report/timeseries.go         | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go
index af5f72e42..e18a0ed4a 100644
--- a/clientv3/concurrency/election.go
+++ b/clientv3/concurrency/election.go
@@ -242,4 +242,4 @@ func (e *Election) Key() string { return e.leaderKey }
 func (e *Election) Rev() int64 { return e.leaderRev }
 
 // Header is the response header from the last successful election proposal.
-func (m *Election) Header() *pb.ResponseHeader { return m.hdr }
+func (e *Election) Header() *pb.ResponseHeader { return e.hdr }
diff --git a/clientv3/namespace/kv.go b/clientv3/namespace/kv.go
index f8c900891..13dd83a24 100644
--- a/clientv3/namespace/kv.go
+++ b/clientv3/namespace/kv.go
@@ -180,8 +180,8 @@ func (kv *kvPrefix) unprefixTxnResponse(resp *clientv3.TxnResponse) {
 	}
 }
 
-func (p *kvPrefix) prefixInterval(key, end []byte) (pfxKey []byte, pfxEnd []byte) {
-	return prefixInterval(p.pfx, key, end)
+func (kv *kvPrefix) prefixInterval(key, end []byte) (pfxKey []byte, pfxEnd []byte) {
+	return prefixInterval(kv.pfx, key, end)
 }
 
 func (kv *kvPrefix) prefixCmps(cs []clientv3.Cmp) []clientv3.Cmp {
diff --git a/mvcc/index.go b/mvcc/index.go
index 13a350c19..237dde630 100644
--- a/mvcc/index.go
+++ b/mvcc/index.go
@@ -221,16 +221,16 @@ func compactIndex(rev int64, available map[revision]struct{}, emptyki *[]*keyInd
 	}
 }
 
-func (a *treeIndex) Equal(bi index) bool {
+func (ti *treeIndex) Equal(bi index) bool {
 	b := bi.(*treeIndex)
 
-	if a.tree.Len() != b.tree.Len() {
+	if ti.tree.Len() != b.tree.Len() {
 		return false
 	}
 
 	equal := true
 
-	a.tree.Ascend(func(item btree.Item) bool {
+	ti.tree.Ascend(func(item btree.Item) bool {
 		aki := item.(*keyIndex)
 		bki := b.tree.Get(item).(*keyIndex)
 		if !aki.equal(bki) {
diff --git a/pkg/report/timeseries.go b/pkg/report/timeseries.go
index ee401eb94..bc1493b2c 100644
--- a/pkg/report/timeseries.go
+++ b/pkg/report/timeseries.go
@@ -118,20 +118,20 @@ func (sp *secondPoints) getTimeSeries() TimeSeries {
 	return tslice
 }
 
-func (ts TimeSeries) String() string {
+func (t TimeSeries) String() string {
 	buf := new(bytes.Buffer)
 	wr := csv.NewWriter(buf)
 	if err := wr.Write([]string{"UNIX-SECOND", "MIN-LATENCY-MS", "AVG-LATENCY-MS", "MAX-LATENCY-MS", "AVG-THROUGHPUT"}); err != nil {
 		log.Fatal(err)
 	}
 	rows := [][]string{}
-	for i := range ts {
+	for i := range t {
 		row := []string{
-			fmt.Sprintf("%d", ts[i].Timestamp),
-			ts[i].MinLatency.String(),
-			ts[i].AvgLatency.String(),
-			ts[i].MaxLatency.String(),
-			fmt.Sprintf("%d", ts[i].ThroughPut),
+			fmt.Sprintf("%d", t[i].Timestamp),
+			t[i].MinLatency.String(),
+			t[i].AvgLatency.String(),
+			t[i].MaxLatency.String(),
+			fmt.Sprintf("%d", t[i].ThroughPut),
 		}
 		rows = append(rows, row)
 	}