style(bs:tx) rename receiver -> forwarder
Brian Tiger Chow committed
Sep 14, 2014 at 03:49 UTC
5b5e17ed79b2d572a9e645a8c7a9a050169fde2c
5 files changed
+14
-13
bitswap/bitswap.go
+1
-1
@@ -64,7 +64,7 @@ type BitSwap struct {
64
65
// NewBitSwap creates a new BitSwap instance. It does not check its parameters.
66
func NewBitSwap(p *peer.Peer, net swarm.Network, d ds.Datastore, r routing.IpfsRouting) *BitSwap {
67
- receiver := receiver{}
67
+ receiver := tx.Forwarder{}
68
sender := tx.NewBSNetService(context.Background(), &receiver)
69
bs := &BitSwap{
70
peer: p,
bitswap/transmission/forwarder.go
renamed
+6
-7
@@ -1,21 +1,20 @@
1
-package bitswap
1
+package transmission
2
3
import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
bsmsg "github.com/jbenet/go-ipfs/bitswap/message"
6
- tx "github.com/jbenet/go-ipfs/bitswap/transmission"
6
peer "github.com/jbenet/go-ipfs/peer"
7
)
8
10
-// receiver breaks the circular dependency between bitswap and its sender
9
+// Forwarder breaks the circular dependency between bitswap and its sender
10
// NB: A sender is instantiated with a handler and this sender is then passed
11
// as a constructor argument to BitSwap. However, the handler is BitSwap!
12
// Hence, this receiver.
14
-type receiver struct {
15
- delegate tx.Receiver
13
+type Forwarder struct {
14
+ delegate Receiver
15
}
16
18
-func (r *receiver) ReceiveMessage(
17
+func (r *Forwarder) ReceiveMessage(
18
ctx context.Context, sender *peer.Peer, incoming bsmsg.BitSwapMessage) (
19
bsmsg.BitSwapMessage, *peer.Peer, error) {
20
if r.delegate == nil {
@@ -24,6 +23,6 @@ func (r *receiver) ReceiveMessage(
23
return r.delegate.ReceiveMessage(ctx, sender, incoming)
24
}
25
27
-func (r *receiver) Delegate(delegate tx.Receiver) {
26
+func (r *Forwarder) Delegate(delegate Receiver) {
27
r.delegate = delegate
28
}
bitswap/transmission/forwarder_test.go
renamed
+5
-3
@@ -1,4 +1,4 @@
1
-package bitswap
1
+package transmission
2
3
import (
4
"testing"
@@ -9,6 +9,8 @@ import (
9
)
10
11
func TestDoesntPanicIfDelegateNotPresent(t *testing.T) {
12
- r := receiver{}
13
- r.ReceiveMessage(context.Background(), &peer.Peer{}, bsmsg.New())
12
+ fwdr := Forwarder{}
13
+ fwdr.ReceiveMessage(context.Background(), &peer.Peer{}, bsmsg.New())
14
}
15
+
16
+// TODO(brian): func TestForwardsMessageToDelegate(t *testing.T)
bitswap/transmission/interface.go
+1
-1
@@ -1,4 +1,4 @@
1
-package network
1
+package transmission
2
3
import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
bitswap/transmission/service_wrapper.go
+1
-1
@@ -1,4 +1,4 @@
1
-package network
1
+package transmission
2
3
import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"