refactor(bitswap/network) rename -> BitSwapNetwork
remove 'adapter' concept instead, describe the component as the bitswap network it's still an adapter, but it's just not necessary to describe it as such
Brian Tiger Chow committed
Oct 27, 2014 at 07:16 UTC
154cf4af751e4df6b0fa72d62e3e3152db9606da
2 files changed
+27
-26
exchange/bitswap/bitswap.go
+1
-1
@@ -37,7 +37,7 @@ func NetMessageSession(ctx context.Context, p peer.Peer,
37
}
38
}()
39
40
- network := bsnet.NetMessageAdapter(srv, net, nil)
40
+ network := bsnet.NewFromIpfsNetwork(srv, net)
41
42
bs := &bitswap{
43
blockstore: blockstore.NewBlockstore(d),
exchange/bitswap/network/ipfs_impl.go
renamed
+26
-25
@@ -4,31 +4,32 @@ import (
4
"errors"
5
6
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
- "github.com/jbenet/go-ipfs/util"
7
8
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
9
inet "github.com/jbenet/go-ipfs/net"
10
netmsg "github.com/jbenet/go-ipfs/net/message"
11
peer "github.com/jbenet/go-ipfs/peer"
12
+ util "github.com/jbenet/go-ipfs/util"
13
)
14
15
-var log = util.Logger("net_message_adapter")
15
+var log = util.Logger("bitswap_network")
16
17
-// NetMessageAdapter wraps a NetMessage network service
18
-func NetMessageAdapter(s inet.Service, n inet.Network, r Receiver) BitSwapNetwork {
19
- adapter := impl{
20
- nms: s,
21
- net: n,
22
- receiver: r,
17
+// NewFromIpfsNetwork returns a BitSwapNetwork supported by underlying IPFS
18
+// Network & Service
19
+func NewFromIpfsNetwork(s inet.Service, n inet.Network) BitSwapNetwork {
20
+ bitswapNetwork := impl{
21
+ service: s,
22
+ net: n,
23
}
24
- s.SetHandler(&adapter)
25
- return &adapter
24
+ s.SetHandler(&bitswapNetwork)
25
+ return &bitswapNetwork
26
}
27
28
-// implements an Adapter that integrates with a NetMessage network service
28
+// impl transforms the ipfs network interface, which sends and receives
29
+// NetMessage objects, into the bitswap network interface.
30
type impl struct {
30
- nms inet.Service
31
- net inet.Network
31
+ service inet.Service
32
+ net inet.Network
33
34
// inbound messages from the network are forwarded to the receiver
35
receiver Receiver
@@ -36,30 +37,30 @@ type impl struct {
37
38
// HandleMessage marshals and unmarshals net messages, forwarding them to the
39
// BitSwapMessage receiver
39
-func (adapter *impl) HandleMessage(
40
+func (bsnet *impl) HandleMessage(
41
ctx context.Context, incoming netmsg.NetMessage) netmsg.NetMessage {
42
42
- if adapter.receiver == nil {
43
+ if bsnet.receiver == nil {
44
return nil
45
}
46
47
received, err := bsmsg.FromNet(incoming)
48
if err != nil {
48
- go adapter.receiver.ReceiveError(err)
49
+ go bsnet.receiver.ReceiveError(err)
50
return nil
51
}
52
52
- p, bsmsg := adapter.receiver.ReceiveMessage(ctx, incoming.Peer(), received)
53
+ p, bsmsg := bsnet.receiver.ReceiveMessage(ctx, incoming.Peer(), received)
54
55
// TODO(brian): put this in a helper function
56
if bsmsg == nil || p == nil {
56
- adapter.receiver.ReceiveError(errors.New("ReceiveMessage returned nil peer or message"))
57
+ bsnet.receiver.ReceiveError(errors.New("ReceiveMessage returned nil peer or message"))
58
return nil
59
}
60
61
outgoing, err := bsmsg.ToNet(p)
62
if err != nil {
62
- go adapter.receiver.ReceiveError(err)
63
+ go bsnet.receiver.ReceiveError(err)
64
return nil
65
}
66
@@ -71,7 +72,7 @@ func (adapter *impl) DialPeer(ctx context.Context, p peer.Peer) error {
72
return adapter.net.DialPeer(ctx, p)
73
}
74
74
-func (adapter *impl) SendMessage(
75
+func (bsnet *impl) SendMessage(
76
ctx context.Context,
77
p peer.Peer,
78
outgoing bsmsg.BitSwapMessage) error {
@@ -80,10 +81,10 @@ func (adapter *impl) SendMessage(
81
if err != nil {
82
return err
83
}
83
- return adapter.nms.SendMessage(ctx, nmsg)
84
+ return bsnet.service.SendMessage(ctx, nmsg)
85
}
86
86
-func (adapter *impl) SendRequest(
87
+func (bsnet *impl) SendRequest(
88
ctx context.Context,
89
p peer.Peer,
90
outgoing bsmsg.BitSwapMessage) (bsmsg.BitSwapMessage, error) {
@@ -92,13 +93,13 @@ func (adapter *impl) SendRequest(
93
if err != nil {
94
return nil, err
95
}
95
- incomingMsg, err := adapter.nms.SendRequest(ctx, outgoingMsg)
96
+ incomingMsg, err := bsnet.service.SendRequest(ctx, outgoingMsg)
97
if err != nil {
98
return nil, err
99
}
100
return bsmsg.FromNet(incomingMsg)
101
}
102
102
-func (adapter *impl) SetDelegate(r Receiver) {
103
- adapter.receiver = r
103
+func (bsnet *impl) SetDelegate(r Receiver) {
104
+ bsnet.receiver = r
105
}