opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 02:30:39 +08:00
Code Issues Projects Releases Wiki Activity

refactor(bitswap/testnet) slim down interface

Browse Source 
so it'll be easier to create another implementation using the new
mocknet
This commit is contained in:
Brian Tiger Chow
2014-12-23 18:08:16 -05:00
parent 12b92f03f1
commit e017d6edc6
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
exchange/bitswap/testnet/network.go
View File

@ -5,13 +5,12 @@ import (
"fmt" "fmt"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
"github.com/jbenet/go-ipfs/routing"
"github.com/jbenet/go-ipfs/routing/mock"
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message" bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network" bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
peer "github.com/jbenet/go-ipfs/peer" peer "github.com/jbenet/go-ipfs/peer"
"github.com/jbenet/go-ipfs/util" routing "github.com/jbenet/go-ipfs/routing"
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
util "github.com/jbenet/go-ipfs/util"
delay "github.com/jbenet/go-ipfs/util/delay" delay "github.com/jbenet/go-ipfs/util/delay"
) )
@ -19,19 +18,6 @@ type Network interface {
Adapter(peer.ID) bsnet.BitSwapNetwork Adapter(peer.ID) bsnet.BitSwapNetwork
HasPeer(peer.ID) bool HasPeer(peer.ID) bool
SendMessage(
ctx context.Context,
from peer.ID,
to peer.ID,
message bsmsg.BitSwapMessage) error
SendRequest(
ctx context.Context,
from peer.ID,
to peer.ID,
message bsmsg.BitSwapMessage) (
incoming bsmsg.BitSwapMessage, err error)
} }
// network impl // network impl
@ -154,7 +140,7 @@ func (n *network) SendRequest(
type networkClient struct { type networkClient struct {
local peer.ID local peer.ID
bsnet.Receiver bsnet.Receiver
network Network network *network
routing routing.IpfsRouting routing routing.IpfsRouting
} }