From bd45adfb89c4b61cb20375d3fcc36a18ff68de43 Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Tue, 23 Dec 2014 08:44:25 -0500
Subject: [PATCH] chore(bitswap) remove Peerstore() methods from
 bitswap.Network interface

---
 exchange/bitswap/network/interface.go |  2 --
 exchange/bitswap/network/ipfs_impl.go |  4 ----
 exchange/bitswap/testnet/network.go   | 17 +++++------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/exchange/bitswap/network/interface.go b/exchange/bitswap/network/interface.go
index 08e65cf10..1bc14ca88 100644
--- a/exchange/bitswap/network/interface.go
+++ b/exchange/bitswap/network/interface.go
@@ -26,8 +26,6 @@ type BitSwapNetwork interface {
 		peer.ID,
 		bsmsg.BitSwapMessage) (incoming bsmsg.BitSwapMessage, err error)
 
-	Peerstore() peer.Peerstore
-
 	// SetDelegate registers the Reciver to handle messages received from the
 	// network.
 	SetDelegate(Receiver)
diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go
index 6205e9c29..5388c8e6d 100644
--- a/exchange/bitswap/network/ipfs_impl.go
+++ b/exchange/bitswap/network/ipfs_impl.go
@@ -72,10 +72,6 @@ func (bsnet *impl) SetDelegate(r Receiver) {
 	bsnet.receiver = r
 }
 
-func (bsnet *impl) Peerstore() peer.Peerstore {
-	return bsnet.Peerstore()
-}
-
 // FindProvidersAsync returns a channel of providers for the given key
 func (bsnet *impl) FindProvidersAsync(ctx context.Context, k util.Key, max int) <-chan peer.ID {
 	out := make(chan peer.ID)
diff --git a/exchange/bitswap/testnet/network.go b/exchange/bitswap/testnet/network.go
index 0461508ea..3201ad5c4 100644
--- a/exchange/bitswap/testnet/network.go
+++ b/exchange/bitswap/testnet/network.go
@@ -52,10 +52,9 @@ type network struct {
 
 func (n *network) Adapter(p peer.ID) bsnet.BitSwapNetwork {
 	client := &networkClient{
-		local:     p,
-		network:   n,
-		peerstore: peer.NewPeerstore(),
-		routing:   n.routingserver.Client(peer.PeerInfo{ID: p}),
+		local:   p,
+		network: n,
+		routing: n.routingserver.Client(peer.PeerInfo{ID: p}),
 	}
 	n.clients[p] = client
 	return client
@@ -155,9 +154,8 @@ func (n *network) SendRequest(
 type networkClient struct {
 	local peer.ID
 	bsnet.Receiver
-	network   Network
-	peerstore peer.Peerstore
-	routing   routing.IpfsRouting
+	network Network
+	routing routing.IpfsRouting
 }
 
 func (nc *networkClient) SendMessage(
@@ -187,7 +185,6 @@ func (nc *networkClient) FindProvidersAsync(ctx context.Context, k util.Key, max
 		defer close(out)
 		providers := nc.routing.FindProvidersAsync(ctx, k, max)
 		for info := range providers {
-			nc.peerstore.AddAddresses(info.ID, info.Addrs)
 			select {
 			case <-ctx.Done():
 			case out <- info.ID:
@@ -213,7 +210,3 @@ func (nc *networkClient) DialPeer(ctx context.Context, p peer.ID) error {
 func (nc *networkClient) SetDelegate(r bsnet.Receiver) {
 	nc.Receiver = r
 }
-
-func (nc *networkClient) Peerstore() peer.Peerstore {
-	return nc.peerstore
-}