style(bitswap) rename Adapter -> BitSwapNetwork for clarity
Brian Tiger Chow committed
Oct 27, 2014 at 07:02 UTC
2bc82adfaed3ad46f72d57e1816dac9e99dcb787
4 files changed
+7
-7
exchange/bitswap/bitswap.go
+1
-1
@@ -57,7 +57,7 @@ func NetMessageSession(ctx context.Context, p peer.Peer,
57
type bitswap struct {
58
59
// sender delivers messages on behalf of the session
60
- sender bsnet.Adapter
60
+ sender bsnet.BitSwapNetwork
61
62
// blockstore is the local database
63
// NB: ensure threadsafety
exchange/bitswap/network/interface.go
+3
-3
@@ -8,8 +8,8 @@ import (
8
u "github.com/jbenet/go-ipfs/util"
9
)
10
11
-// Adapter provides network connectivity for BitSwap sessions
12
-type Adapter interface {
11
+// BitSwapNetwork provides network connectivity for BitSwap sessions
12
+type BitSwapNetwork interface {
13
14
// DialPeer ensures there is a connection to peer.
15
DialPeer(context.Context, peer.Peer) error
@@ -31,6 +31,7 @@ type Adapter interface {
31
SetDelegate(Receiver)
32
}
33
34
+// Implement Receiver to receive messages from the BitSwapNetwork
35
type Receiver interface {
36
ReceiveMessage(
37
ctx context.Context, sender peer.Peer, incoming bsmsg.BitSwapMessage) (
@@ -39,7 +40,6 @@ type Receiver interface {
40
ReceiveError(error)
41
}
42
42
-// TODO rename -> Router?
43
type Routing interface {
44
// FindProvidersAsync returns a channel of providers for the given key
45
FindProvidersAsync(context.Context, u.Key, int) <-chan peer.Peer
exchange/bitswap/network/net_message_adapter.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
var log = util.Logger("net_message_adapter")
16
17
// NetMessageAdapter wraps a NetMessage network service
18
-func NetMessageAdapter(s inet.Service, n inet.Network, r Receiver) Adapter {
18
+func NetMessageAdapter(s inet.Service, n inet.Network, r Receiver) BitSwapNetwork {
19
adapter := impl{
20
nms: s,
21
net: n,
exchange/bitswap/testnet/network.go
+2
-2
@@ -13,7 +13,7 @@ import (
13
)
14
15
type Network interface {
16
- Adapter(peer.Peer) bsnet.Adapter
16
+ Adapter(peer.Peer) bsnet.BitSwapNetwork
17
18
HasPeer(peer.Peer) bool
19
@@ -43,7 +43,7 @@ type network struct {
43
clients map[util.Key]bsnet.Receiver
44
}
45
46
-func (n *network) Adapter(p peer.Peer) bsnet.Adapter {
46
+func (n *network) Adapter(p peer.Peer) bsnet.BitSwapNetwork {
47
client := &networkClient{
48
local: p,
49
network: n,