style(bs:tx) rename network -> transmission
Brian Tiger Chow committed
Sep 14, 2014 at 03:13 UTC
2edc03aca18e6fbb9e1a2254d091525b94464157
4 files changed
+6
-6
bitswap/bitswap.go
+3
-3
@@ -8,8 +8,8 @@ import (
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
9
10
bsmsg "github.com/jbenet/go-ipfs/bitswap/message"
11
- bsnet "github.com/jbenet/go-ipfs/bitswap/network"
11
notifications "github.com/jbenet/go-ipfs/bitswap/notifications"
12
+ tx "github.com/jbenet/go-ipfs/bitswap/transmission"
13
blocks "github.com/jbenet/go-ipfs/blocks"
14
swarm "github.com/jbenet/go-ipfs/net/swarm"
15
peer "github.com/jbenet/go-ipfs/peer"
@@ -33,7 +33,7 @@ type BitSwap struct {
33
peer *peer.Peer
34
35
// net holds the connections to all peers.
36
- sender bsnet.Sender
36
+ sender tx.Sender
37
net swarm.Network
38
meschan *swarm.Chan
39
@@ -65,7 +65,7 @@ type BitSwap struct {
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{}
68
- sender := bsnet.NewBSNetService(context.Background(), &receiver)
68
+ sender := tx.NewBSNetService(context.Background(), &receiver)
69
bs := &BitSwap{
70
peer: p,
71
net: net,
bitswap/receiver.go
+3
-3
@@ -3,7 +3,7 @@ package bitswap
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
- bsnet "github.com/jbenet/go-ipfs/bitswap/network"
6
+ tx "github.com/jbenet/go-ipfs/bitswap/transmission"
7
peer "github.com/jbenet/go-ipfs/peer"
8
)
9
@@ -12,7 +12,7 @@ import (
12
// as a constructor argument to BitSwap. However, the handler is BitSwap!
13
// Hence, this receiver.
14
type receiver struct {
15
- delegate bsnet.Receiver
15
+ delegate tx.Receiver
16
}
17
18
func (r *receiver) ReceiveMessage(
@@ -24,6 +24,6 @@ func (r *receiver) ReceiveMessage(
24
return r.delegate.ReceiveMessage(ctx, sender, incoming)
25
}
26
27
-func (r *receiver) Delegate(delegate bsnet.Receiver) {
27
+func (r *receiver) Delegate(delegate tx.Receiver) {
28
r.delegate = delegate
29
}