refactor(bitswap/testnet) slim down interface
so it'll be easier to create another implementation using the new mocknet
Brian Tiger Chow committed
Dec 23, 2014 at 18:08 UTC
e017d6edc65da0cd82c5dc0656d89b0a8ffc729d
1 file changed
+4
-18
exchange/bitswap/testnet/network.go
+4
-18
@@ -5,13 +5,12 @@ import (
5
"fmt"
6
7
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
- "github.com/jbenet/go-ipfs/routing"
9
- "github.com/jbenet/go-ipfs/routing/mock"
10
-
8
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
9
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
10
peer "github.com/jbenet/go-ipfs/peer"
14
- "github.com/jbenet/go-ipfs/util"
11
+ routing "github.com/jbenet/go-ipfs/routing"
12
+ mockrouting "github.com/jbenet/go-ipfs/routing/mock"
13
+ util "github.com/jbenet/go-ipfs/util"
14
delay "github.com/jbenet/go-ipfs/util/delay"
15
)
16
@@ -19,19 +18,6 @@ type Network interface {
18
Adapter(peer.ID) bsnet.BitSwapNetwork
19
20
HasPeer(peer.ID) bool
22
-
23
- SendMessage(
24
- ctx context.Context,
25
- from peer.ID,
26
- to peer.ID,
27
- message bsmsg.BitSwapMessage) error
28
-
29
- SendRequest(
30
- ctx context.Context,
31
- from peer.ID,
32
- to peer.ID,
33
- message bsmsg.BitSwapMessage) (
34
- incoming bsmsg.BitSwapMessage, err error)
21
}
22
23
// network impl
@@ -154,7 +140,7 @@ func (n *network) SendRequest(
140
type networkClient struct {
141
local peer.ID
142
bsnet.Receiver
157
- network Network
143
+ network *network
144
routing routing.IpfsRouting
145
}
146