refactor(core, bitswap) split bitswap init into two steps

@jbenet

core/core.go

@@ -15,6 +15,7 @@ import (
 	diag "github.com/jbenet/go-ipfs/diagnostics"
 	exchange "github.com/jbenet/go-ipfs/exchange"
 	bitswap "github.com/jbenet/go-ipfs/exchange/bitswap"
+	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
 	merkledag "github.com/jbenet/go-ipfs/merkledag"
 	namesys "github.com/jbenet/go-ipfs/namesys"
 	inet "github.com/jbenet/go-ipfs/net"
@@ -150,8 +151,8 @@ func NewIpfsNode(cfg *config.Config, online bool) (n *IpfsNode, err error) {
 
 		// setup exchange service
 		const alwaysSendToPeer = true // use YesManStrategy
-		n.Exchange = bitswap.NetMessageSession(ctx, n.Identity, n.Network, exchangeService, n.Routing, n.Datastore, alwaysSendToPeer)
-		// ok, this function call is ridiculous o/ consider making it simpler.
+		bitswapNetwork := bsnet.NewFromIpfsNetwork(exchangeService, n.Network)
+		n.Exchange = bitswap.New(ctx, n.Identity, bitswapNetwork, n.Routing, n.Datastore, alwaysSendToPeer)
 
 		go initConnections(ctx, n.Config, n.Peerstore, dhtRouting)
 	}

exchange/bitswap/bitswap.go

@@ -15,18 +15,18 @@ 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"
 )
 
 var log = u.Logger("bitswap")
 
-// NetMessageSession initializes a BitSwap session that communicates over the
-// provided NetMessage service.
+// New initializes a BitSwap instance that communicates over the
+// provided BitSwapNetwork. This function registers the returned instance as
+// the network delegate.
 // Runs until context is cancelled
-func NetMessageSession(ctx context.Context, p peer.Peer,
-	net inet.Network, srv inet.Service, routing bsnet.Routing,
+func New(ctx context.Context, p peer.Peer,
+	network bsnet.BitSwapNetwork, routing bsnet.Routing,
 	d ds.ThreadSafeDatastore, nice bool) exchange.Interface {
 
 	notif := notifications.New()
@@ -37,8 +37,6 @@ func NetMessageSession(ctx context.Context, p peer.Peer,
 		}
 	}()
 
-	network := bsnet.NewFromIpfsNetwork(srv, net)
-
 	bs := &bitswap{
 		blockstore:    blockstore.NewBlockstore(d),
 		notifications: notif,