Revert "bitswap: network interface changed"
This reverts commit bf88f1aec5e3d397f97d64de52b52686cc7a8c8f.
Brian Tiger Chow committed
Dec 23, 2014 at 08:35 UTC
55c8f8f5052e829ee2ec8c17e65e508e58f40210
4 files changed
+11
-14
exchange/bitswap/bitswap.go
+5
-7
@@ -176,16 +176,14 @@ func (bs *bitswap) sendWantListTo(ctx context.Context, peers <-chan peer.PeerInf
176
message.AddEntry(wanted.Key, wanted.Priority)
177
}
178
wg := sync.WaitGroup{}
179
- for pi := range peers {
180
- log.Debugf("bitswap.sendWantListTo: %s %s", pi.ID, pi.Addrs)
181
- log.Event(ctx, "PeerToQuery", pi.ID)
179
+ for peerToQuery := range peers {
180
+ log.Event(ctx, "PeerToQuery", peerToQuery.ID)
181
wg.Add(1)
183
- go func(pi peer.PeerInfo) {
182
+ go func(p peer.ID) {
183
defer wg.Done()
185
- p := pi.ID
184
185
log.Event(ctx, "DialPeer", p)
188
- err := bs.sender.DialPeer(ctx, pi)
186
+ err := bs.sender.DialPeer(ctx, p)
187
if err != nil {
188
log.Errorf("Error sender.DialPeer(%s): %s", p, err)
189
return
@@ -200,7 +198,7 @@ func (bs *bitswap) sendWantListTo(ctx context.Context, peers <-chan peer.PeerInf
198
// communication fails. May require slightly different API to
199
// get better guarantees. May need shared sequence numbers.
200
bs.engine.MessageSent(p, message)
203
- }(pi)
201
+ }(peerToQuery.ID)
202
}
203
wg.Wait()
204
return nil
exchange/bitswap/network/interface.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
type BitSwapNetwork interface {
13
14
// DialPeer ensures there is a connection to peer.
15
- DialPeer(context.Context, peer.PeerInfo) error
15
+ DialPeer(context.Context, peer.ID) error
16
17
// SendMessage sends a BitSwap message to a peer.
18
SendMessage(
exchange/bitswap/network/ipfs_impl.go
+2
-3
@@ -53,9 +53,8 @@ func (bsnet *impl) handleNewStream(s inet.Stream) {
53
54
}
55
56
-func (bsnet *impl) DialPeer(ctx context.Context, p peer.PeerInfo) error {
57
- bsnet.network.Peerstore().AddAddresses(p.ID, p.Addrs)
58
- return bsnet.network.DialPeer(ctx, p.ID)
56
+func (bsnet *impl) DialPeer(ctx context.Context, p peer.ID) error {
57
+ return bsnet.network.DialPeer(ctx, p)
58
}
59
60
func (bsnet *impl) SendMessage(
exchange/bitswap/testnet/network.go
+3
-3
@@ -165,10 +165,10 @@ func (nc *networkClient) SendRequest(
165
return nc.network.SendRequest(ctx, nc.local, to, message)
166
}
167
168
-func (nc *networkClient) DialPeer(ctx context.Context, p peer.PeerInfo) error {
168
+func (nc *networkClient) DialPeer(ctx context.Context, p peer.ID) error {
169
// no need to do anything because dialing isn't a thing in this test net.
170
- if !nc.network.HasPeer(p.ID) {
171
- return fmt.Errorf("Peer not in network: %s", p.ID)
170
+ if !nc.network.HasPeer(p) {
171
+ return fmt.Errorf("Peer not in network: %s", p)
172
}
173
return nil
174
}