From 373d3c4c31309a03444726340a92e8c10cd1ff93 Mon Sep 17 00:00:00 2001
From: Leo Balduf <balduf@hm.edu>
Date: Sat, 16 Apr 2016 16:01:18 -0400
Subject: [PATCH] make peer Equal work on values

---
 chihaya.go                                 | 7 ++-----
 chihaya_test.go                            | 4 ++--
 middleware/varinterval/varinterval_test.go | 4 ++--
 server/store/memory/peer_store.go          | 4 ++--
 server/store/memory/peer_store_test.go     | 4 ++--
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/chihaya.go b/chihaya.go
index 096427a..8a7386b 100644
--- a/chihaya.go
+++ b/chihaya.go
@@ -77,9 +77,6 @@ type Params interface {
 }
 
 // Equal reports whether peer and x are the same.
-func (peer *Peer) Equal(x *Peer) bool {
-	if peer.ID == x.ID && peer.Port == x.Port && peer.IP.Equal(x.IP) {
-		return true
-	}
-	return false
+func (peer Peer) Equal(x Peer) bool {
+	return peer.ID == x.ID && peer.Port == x.Port && peer.IP.Equal(x.IP)
 }
diff --git a/chihaya_test.go b/chihaya_test.go
index 20805e3..8b2d5b9 100644
--- a/chihaya_test.go
+++ b/chihaya_test.go
@@ -27,9 +27,9 @@ var (
 
 func TestPeerEquality(t *testing.T) {
 	// Build peers from test data.
-	var builtPeers []*Peer
+	var builtPeers []Peer
 	for _, peer := range peers {
-		builtPeers = append(builtPeers, &Peer{
+		builtPeers = append(builtPeers, Peer{
 			ID:   PeerID(peer.peerID),
 			IP:   net.ParseIP(peer.ip),
 			Port: peer.port,
diff --git a/middleware/varinterval/varinterval_test.go b/middleware/varinterval/varinterval_test.go
index 1f70949..5da0fe6 100644
--- a/middleware/varinterval/varinterval_test.go
+++ b/middleware/varinterval/varinterval_test.go
@@ -43,8 +43,8 @@ func TestConstructor(t *testing.T) {
 func TestModifyResponse(t *testing.T) {
 	var (
 		achain tracker.AnnounceChain
-		req chihaya.AnnounceRequest
-		resp chihaya.AnnounceResponse
+		req    chihaya.AnnounceRequest
+		resp   chihaya.AnnounceResponse
 	)
 
 	mw, err := constructor(chihaya.MiddlewareConfig{
diff --git a/server/store/memory/peer_store.go b/server/store/memory/peer_store.go
index bc9ecf8..6638940 100644
--- a/server/store/memory/peer_store.go
+++ b/server/store/memory/peer_store.go
@@ -271,12 +271,12 @@ func (s *peerStore) AnnouncePeers(infoHash chihaya.InfoHash, seeder bool, numWan
 				}
 
 				if p.IP.To4() == nil {
-					if p.Equal(&peer6) {
+					if p.Equal(peer6) {
 						continue
 					}
 					peers6 = append(peers6, p.Peer)
 				} else {
-					if p.Equal(&peer4) {
+					if p.Equal(peer4) {
 						continue
 					}
 					peers = append(peers, p.Peer)
diff --git a/server/store/memory/peer_store_test.go b/server/store/memory/peer_store_test.go
index a363d5a..157e00e 100644
--- a/server/store/memory/peer_store_test.go
+++ b/server/store/memory/peer_store_test.go
@@ -16,7 +16,7 @@ import (
 
 func peerInSlice(peer chihaya.Peer, peers []chihaya.Peer) bool {
 	for _, v := range peers {
-		if v.Equal(&peer) {
+		if v.Equal(peer) {
 			return true
 		}
 	}
@@ -147,7 +147,7 @@ func TestPeerStoreAPI(t *testing.T) {
 	assert.Equal(t, 7, s.NumSeeders(hash))
 	assert.Equal(t, 3, s.NumLeechers(hash))
 
-	peers1, peers61, err := s.AnnouncePeers(hash, true, 5,peer,chihaya.Peer{})
+	peers1, peers61, err := s.AnnouncePeers(hash, true, 5, peer, chihaya.Peer{})
 	assert.Nil(t, err)
 	assert.NotNil(t, peers1)
 	assert.NotNil(t, peers61)