clean up and add inet.Network to bitswap

new Service interface

bitswap.go

@@ -11,6 +11,7 @@ import (
 	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
 	notifications "github.com/jbenet/go-ipfs/exchange/bitswap/notifications"
 	strategy "github.com/jbenet/go-ipfs/exchange/bitswap/strategy"
+	inet "github.com/jbenet/go-ipfs/net"
 	peer "github.com/jbenet/go-ipfs/peer"
 	u "github.com/jbenet/go-ipfs/util"
 )
@@ -19,14 +20,17 @@ var log = u.Logger("bitswap")
 
 // NetMessageSession initializes a BitSwap session that communicates over the
 // provided NetMessage service
-func NetMessageSession(parent context.Context, p *peer.Peer, s bsnet.NetMessageService, directory bsnet.Routing, d ds.Datastore, nice bool) exchange.Interface {
+func NetMessageSession(parent context.Context, p *peer.Peer,
+	net inet.Network, srv inet.Service, directory bsnet.Routing,
+	d ds.Datastore, nice bool) exchange.Interface {
 
-	networkAdapter := bsnet.NetMessageAdapter(s, nil)
+	networkAdapter := bsnet.NetMessageAdapter(srv, nil)
 	bs := &bitswap{
 		blockstore:    blockstore.NewBlockstore(d),
 		notifications: notifications.New(),
 		strategy:      strategy.New(nice),
 		routing:       directory,
+		network:       net,
 		sender:        networkAdapter,
 		wantlist:      u.NewKeySet(),
 	}
@@ -38,6 +42,9 @@ func NetMessageSession(parent context.Context, p *peer.Peer, s bsnet.NetMessageS
 // bitswap instances implement the bitswap protocol.
 type bitswap struct {
 
+	// network maintains connections to the outside world.
+	network inet.Network
+
 	// sender delivers messages on behalf of the session
 	sender bsnet.Adapter
 
@@ -79,7 +86,7 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error)
 		}
 		message.AppendWanted(k)
 		for iiiii := range peersToQuery {
-			// log.Debug("bitswap got peersToQuery: %s", iiiii)
+			log.Debug("bitswap got peersToQuery: %s", iiiii)
 			go func(p *peer.Peer) {
 				response, err := bs.sender.SendRequest(ctx, p, message)
 				if err != nil {

network/interface.go

@@ -2,10 +2,8 @@ package network
 
 import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
-	netservice "github.com/jbenet/go-ipfs/net/service"
 
 	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
-	netmsg "github.com/jbenet/go-ipfs/net/message"
 	peer "github.com/jbenet/go-ipfs/peer"
 	u "github.com/jbenet/go-ipfs/util"
 )
@@ -38,13 +36,6 @@ type Receiver interface {
 	ReceiveError(error)
 }
 
-// TODO(brian): move this to go-ipfs/net package
-type NetMessageService interface {
-	SendRequest(ctx context.Context, m netmsg.NetMessage) (netmsg.NetMessage, error)
-	SendMessage(ctx context.Context, m netmsg.NetMessage) error
-	SetHandler(netservice.Handler)
-}
-
 // TODO rename -> Router?
 type Routing interface {
 	// FindProvidersAsync returns a channel of providers for the given key

network/net_message_adapter.go

@@ -4,12 +4,13 @@ import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
 	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
+	inet "github.com/jbenet/go-ipfs/net"
 	netmsg "github.com/jbenet/go-ipfs/net/message"
 	peer "github.com/jbenet/go-ipfs/peer"
 )
 
 // NetMessageAdapter wraps a NetMessage network service
-func NetMessageAdapter(s NetMessageService, r Receiver) Adapter {
+func NetMessageAdapter(s inet.Service, r Receiver) Adapter {
 	adapter := impl{
 		nms:      s,
 		receiver: r,
@@ -20,7 +21,7 @@ func NetMessageAdapter(s NetMessageService, r Receiver) Adapter {
 
 // implements an Adapter that integrates with a NetMessage network service
 type impl struct {
-	nms NetMessageService
+	nms inet.Service
 
 	// inbound messages from the network are forwarded to the receiver
 	receiver Receiver