refctor(bitswap/network) replace Network interface with Dialer interface
Brian Tiger Chow committed
Oct 27, 2014 at 15:25 UTC
3663eef5acaf56ac148c1644be02eeaf3a6d336e
1 file changed
+6
-6
exchange/bitswap/network/ipfs_impl.go
+6
-6
@@ -15,11 +15,11 @@ import (
15
var log = util.Logger("bitswap_network")
16
17
// NewFromIpfsNetwork returns a BitSwapNetwork supported by underlying IPFS
18
-// Network & Service
19
-func NewFromIpfsNetwork(s inet.Service, n inet.Network) BitSwapNetwork {
18
+// Dialer & Service
19
+func NewFromIpfsNetwork(s inet.Service, dialer inet.Dialer) BitSwapNetwork {
20
bitswapNetwork := impl{
21
service: s,
22
- net: n,
22
+ dialer: dialer,
23
}
24
s.SetHandler(&bitswapNetwork)
25
return &bitswapNetwork
@@ -29,7 +29,7 @@ func NewFromIpfsNetwork(s inet.Service, n inet.Network) BitSwapNetwork {
29
// NetMessage objects, into the bitswap network interface.
30
type impl struct {
31
service inet.Service
32
- net inet.Network
32
+ dialer inet.Dialer
33
34
// inbound messages from the network are forwarded to the receiver
35
receiver Receiver
@@ -68,8 +68,8 @@ func (bsnet *impl) HandleMessage(
68
return outgoing
69
}
70
71
-func (adapter *impl) DialPeer(ctx context.Context, p peer.Peer) error {
72
- return adapter.net.DialPeer(ctx, p)
71
+func (bsnet *impl) DialPeer(ctx context.Context, p peer.Peer) error {
72
+ return bsnet.dialer.DialPeer(ctx, p)
73
}
74
75
func (bsnet *impl) SendMessage(