From 7b85579d7a00a01febc0073a76ce49552ba70f46 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sat, 31 Jan 2015 17:20:34 -0800
Subject: [PATCH] core: move online service init block into own func

addresses CR comments
---
 core/core.go | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/core/core.go b/core/core.go
index 058a68b39..93411c4a4 100644
--- a/core/core.go
+++ b/core/core.go
@@ -220,27 +220,8 @@ func (n *IpfsNode) StartOnlineServices(ctx context.Context) error {
 	}
 	n.PeerHost = peerhost
 
-	// this block is the set of services which need to be initialized with the host
-	// and _before_ we start listening.
-	{
-		// setup diagnostics service
-		n.Diagnostics = diag.NewDiagnostics(n.Identity, n.PeerHost)
-
-		// setup routing service
-		dhtRouting, err := constructDHTRouting(ctx, n.PeerHost, n.Repo.Datastore())
-		if err != nil {
-			return debugerror.Wrap(err)
-		}
-		n.Routing = dhtRouting
-
-		// setup exchange service
-		const alwaysSendToPeer = true // use YesManStrategy
-		bitswapNetwork := bsnet.NewFromIpfsHost(n.PeerHost, n.Routing)
-		n.Exchange = bitswap.New(ctx, n.Identity, bitswapNetwork, n.Blockstore, alwaysSendToPeer)
-
-		// setup name system
-		// TODO implement an offline namesys that serves only local names.
-		n.Namesys = namesys.NewNameSystem(n.Routing)
+	if err := n.startOnlineServicesWithHost(ctx); err != nil {
+		return err
 	}
 
 	// Ok, now we're ready to listen.
@@ -254,6 +235,29 @@ func (n *IpfsNode) StartOnlineServices(ctx context.Context) error {
 	return n.Bootstrap(DefaultBootstrapConfig)
 }
 
+// startOnlineServicesWithHost  is the set of services which need to be
+// initialized with the host and _before_ we start listening.
+func (n *IpfsNode) startOnlineServicesWithHost(ctx context.Context) error {
+	// setup diagnostics service
+	n.Diagnostics = diag.NewDiagnostics(n.Identity, n.PeerHost)
+
+	// setup routing service
+	dhtRouting, err := constructDHTRouting(ctx, n.PeerHost, n.Repo.Datastore())
+	if err != nil {
+		return debugerror.Wrap(err)
+	}
+	n.Routing = dhtRouting
+
+	// setup exchange service
+	const alwaysSendToPeer = true // use YesManStrategy
+	bitswapNetwork := bsnet.NewFromIpfsHost(n.PeerHost, n.Routing)
+	n.Exchange = bitswap.New(ctx, n.Identity, bitswapNetwork, n.Blockstore, alwaysSendToPeer)
+
+	// setup name system
+	n.Namesys = namesys.NewNameSystem(n.Routing)
+	return nil
+}
+
 // teardown closes owned children. If any errors occur, this function returns
 // the first error.
 func (n *IpfsNode) teardown() error {