chore(bitswap) remove Peerstore() methods from bitswap.Network interface
Brian Tiger Chow committed
Dec 23, 2014 at 08:44 UTC
bd45adfb89c4b61cb20375d3fcc36a18ff68de43
3 files changed
+5
-18
exchange/bitswap/network/interface.go
-2
@@ -26,8 +26,6 @@ type BitSwapNetwork interface {
26
peer.ID,
27
bsmsg.BitSwapMessage) (incoming bsmsg.BitSwapMessage, err error)
28
29
- Peerstore() peer.Peerstore
30
-
29
// SetDelegate registers the Reciver to handle messages received from the
30
// network.
31
SetDelegate(Receiver)
exchange/bitswap/network/ipfs_impl.go
-4
@@ -72,10 +72,6 @@ func (bsnet *impl) SetDelegate(r Receiver) {
72
bsnet.receiver = r
73
}
74
75
-func (bsnet *impl) Peerstore() peer.Peerstore {
76
- return bsnet.Peerstore()
77
-}
78
-
75
// FindProvidersAsync returns a channel of providers for the given key
76
func (bsnet *impl) FindProvidersAsync(ctx context.Context, k util.Key, max int) <-chan peer.ID {
77
out := make(chan peer.ID)
exchange/bitswap/testnet/network.go
+5
-12
@@ -52,10 +52,9 @@ type network struct {
52
53
func (n *network) Adapter(p peer.ID) bsnet.BitSwapNetwork {
54
client := &networkClient{
55
- local: p,
56
- network: n,
57
- peerstore: peer.NewPeerstore(),
58
- routing: n.routingserver.Client(peer.PeerInfo{ID: p}),
55
+ local: p,
56
+ network: n,
57
+ routing: n.routingserver.Client(peer.PeerInfo{ID: p}),
58
}
59
n.clients[p] = client
60
return client
@@ -155,9 +154,8 @@ func (n *network) SendRequest(
154
type networkClient struct {
155
local peer.ID
156
bsnet.Receiver
158
- network Network
159
- peerstore peer.Peerstore
160
- routing routing.IpfsRouting
157
+ network Network
158
+ routing routing.IpfsRouting
159
}
160
161
func (nc *networkClient) SendMessage(
@@ -187,7 +185,6 @@ func (nc *networkClient) FindProvidersAsync(ctx context.Context, k util.Key, max
185
defer close(out)
186
providers := nc.routing.FindProvidersAsync(ctx, k, max)
187
for info := range providers {
190
- nc.peerstore.AddAddresses(info.ID, info.Addrs)
188
select {
189
case <-ctx.Done():
190
case out <- info.ID:
@@ -213,7 +210,3 @@ func (nc *networkClient) DialPeer(ctx context.Context, p peer.ID) error {
210
func (nc *networkClient) SetDelegate(r bsnet.Receiver) {
211
nc.Receiver = r
212
}
216
-
217
-func (nc *networkClient) Peerstore() peer.Peerstore {
218
- return nc.peerstore
219
-}