style(exch:bitswap) rename adapter, session, etc.
style(exch:bitswap) rename NetMessage adapter impl
Brian Tiger Chow committed
Sep 18, 2014 at 22:19 UTC
0c67019447d7cc3e1ef36984637b088040c26e98
4 files changed
+26
-26
core/core.go
+1
-2
@@ -118,8 +118,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
118
// TODO(brian): perform this inside NewDHT factory method
119
dhtService.Handler = route // wire the handler to the service.
120
121
- // TODO(brian): pass a context to bs for its async operations
122
- exchangeSession = bitswap.NewSession(ctx, exchangeService, local, d, route)
121
+ exchangeSession = bitswap.NetMessageSession(ctx, exchangeService, local, d, route)
122
123
// TODO(brian): pass a context to initConnections
124
go initConnections(cfg, route)
exchange/bitswap/bitswap.go
+5
-4
@@ -24,10 +24,11 @@ type Routing interface {
24
Provide(key u.Key) error
25
}
26
27
-// NewSession initializes a bitswap session.
28
-func NewSession(parent context.Context, s bsnet.NetworkService, p *peer.Peer, d ds.Datastore, directory Routing) exchange.Interface {
27
+// NetMessageSession initializes a BitSwap session that communicates over the
28
+// provided NetMessage service
29
+func NetMessageSession(parent context.Context, s bsnet.NetMessageService, p *peer.Peer, d ds.Datastore, directory Routing) exchange.Interface {
30
30
- networkAdapter := bsnet.NewNetworkAdapter(s, nil)
31
+ networkAdapter := bsnet.NetMessageAdapter(s, nil)
32
bs := &bitswap{
33
blockstore: blockstore.NewBlockstore(d),
34
notifications: notifications.New(),
@@ -44,7 +45,7 @@ func NewSession(parent context.Context, s bsnet.NetworkService, p *peer.Peer, d
45
type bitswap struct {
46
47
// sender delivers messages on behalf of the session
47
- sender bsnet.NetworkAdapter
48
+ sender bsnet.Adapter
49
50
// blockstore is the local database
51
// NB: ensure threadsafety
exchange/bitswap/network/interface.go
+3
-3
@@ -9,8 +9,8 @@ import (
9
peer "github.com/jbenet/go-ipfs/peer"
10
)
11
12
-// NetworkAdapter mediates the exchange's communication with the network.
13
-type NetworkAdapter interface {
12
+// Adapter provides network connectivity for BitSwap sessions
13
+type Adapter interface {
14
15
// SendMessage sends a BitSwap message to a peer.
16
SendMessage(
@@ -36,7 +36,7 @@ type Receiver interface {
36
}
37
38
// TODO(brian): move this to go-ipfs/net package
39
-type NetworkService interface {
39
+type NetMessageService interface {
40
SendRequest(ctx context.Context, m netmsg.NetMessage) (netmsg.NetMessage, error)
41
SendMessage(ctx context.Context, m netmsg.NetMessage) error
42
SetHandler(netservice.Handler)
exchange/bitswap/network/net_message_adapter.go
renamed
+17
-17
@@ -10,27 +10,27 @@ import (
10
peer "github.com/jbenet/go-ipfs/peer"
11
)
12
13
-// NewSender wraps a network Service to perform translation between
14
-// BitSwapMessage and NetMessage formats. This allows the BitSwap session to
15
-// ignore these details.
16
-func NewNetworkAdapter(s NetworkService, r Receiver) NetworkAdapter {
17
- adapter := networkAdapter{
18
- networkService: s,
19
- receiver: r,
13
+// NetMessageAdapter wraps a NetMessage network service
14
+func NetMessageAdapter(s NetMessageService, r Receiver) Adapter {
15
+ adapter := impl{
16
+ nms: s,
17
+ receiver: r,
18
}
19
s.SetHandler(&adapter)
20
return &adapter
21
}
22
25
-// networkAdapter implements NetworkAdapter
26
-type networkAdapter struct {
27
- networkService NetworkService
28
- receiver Receiver
23
+// implements an Adapter that integrates with a NetMessage network service
24
+type impl struct {
25
+ nms NetMessageService
26
+
27
+ // inbound messages from the network are forwarded to the receiver
28
+ receiver Receiver
29
}
30
31
// HandleMessage marshals and unmarshals net messages, forwarding them to the
32
// BitSwapMessage receiver
33
-func (adapter *networkAdapter) HandleMessage(
33
+func (adapter *impl) HandleMessage(
34
ctx context.Context, incoming netmsg.NetMessage) (netmsg.NetMessage, error) {
35
36
if adapter.receiver == nil {
@@ -60,7 +60,7 @@ func (adapter *networkAdapter) HandleMessage(
60
return outgoing, nil
61
}
62
63
-func (adapter *networkAdapter) SendMessage(
63
+func (adapter *impl) SendMessage(
64
ctx context.Context,
65
p *peer.Peer,
66
outgoing bsmsg.BitSwapMessage) error {
@@ -69,10 +69,10 @@ func (adapter *networkAdapter) SendMessage(
69
if err != nil {
70
return err
71
}
72
- return adapter.networkService.SendMessage(ctx, nmsg)
72
+ return adapter.nms.SendMessage(ctx, nmsg)
73
}
74
75
-func (adapter *networkAdapter) SendRequest(
75
+func (adapter *impl) SendRequest(
76
ctx context.Context,
77
p *peer.Peer,
78
outgoing bsmsg.BitSwapMessage) (bsmsg.BitSwapMessage, error) {
@@ -81,13 +81,13 @@ func (adapter *networkAdapter) SendRequest(
81
if err != nil {
82
return nil, err
83
}
84
- incomingMsg, err := adapter.networkService.SendRequest(ctx, outgoingMsg)
84
+ incomingMsg, err := adapter.nms.SendRequest(ctx, outgoingMsg)
85
if err != nil {
86
return nil, err
87
}
88
return bsmsg.FromNet(incomingMsg)
89
}
90
91
-func (adapter *networkAdapter) SetDelegate(r Receiver) {
91
+func (adapter *impl) SetDelegate(r Receiver) {
92
adapter.receiver = r
93
}