From 4f4b3d3bae41f9f9f4e90871ff6369c2256da47b Mon Sep 17 00:00:00 2001
From: Milos Gajdos <milosgajdos83@gmail.com>
Date: Tue, 3 Sep 2019 19:51:52 +0100
Subject: [PATCH] Send connect message to NetworkChannel once we are not at
 caller mercy

---
 network/default.go | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/network/default.go b/network/default.go
index d9d8cbfe..202e18f1 100644
--- a/network/default.go
+++ b/network/default.go
@@ -764,23 +764,10 @@ func (n *network) Connect() error {
 		return err
 	}
 
-	// go resolving network nodes
-	go n.resolve()
-	// broadcast neighbourhood
-	go n.announce(netClient)
-	// prune stale nodes
-	go n.prune()
-	// listen to network messages
-	go n.processNetChan(netListener)
-	// advertise service routes
-	go n.advertise(ctrlClient, advertChan)
-	// accept and process routes
-	go n.processCtrlChan(ctrlListener)
-
-	// set connected to true
-	n.connected = true
-
 	// send connect message to NetworkChannel
+	// NOTE: in theory we could do this as soon as
+	// Dial to NetworkChannel succeeds, but instead
+	// we initialize all other node resources first
 	node := &pbNet.Node{
 		Id:      n.options.Id,
 		Address: n.options.Address,
@@ -803,6 +790,22 @@ func (n *network) Connect() error {
 		}
 	}
 
+	// go resolving network nodes
+	go n.resolve()
+	// broadcast neighbourhood
+	go n.announce(netClient)
+	// prune stale nodes
+	go n.prune()
+	// listen to network messages
+	go n.processNetChan(netListener)
+	// advertise service routes
+	go n.advertise(ctrlClient, advertChan)
+	// accept and process routes
+	go n.processCtrlChan(ctrlListener)
+
+	// set connected to true
+	n.connected = true
+
 	return nil
 }