Roll MakeConnectionToPeers into CreateSyncConfig

api/service/syncing/syncing.go

@@ -166,11 +166,7 @@ func (ss *StateSync) CreateSyncConfig(peers []p2p.Peer) error {
 		}
 	}
 	utils.GetLogInstance().Info("[SYNC] Finished creating SyncConfig")
-	return nil
-}
 
-// MakeConnectionToPeers makes grpc connection to all peers.
-func (ss *StateSync) MakeConnectionToPeers() {
 	var wg sync.WaitGroup
 	wg.Add(ss.peerNumber)
 	for id := range ss.syncConfig.peers {
@@ -182,6 +178,8 @@ func (ss *StateSync) MakeConnectionToPeers() {
 	wg.Wait()
 	ss.CleanUpNilPeers()
 	utils.GetLogInstance().Info("[SYNC] Finished making connection to peers.")
+
+	return nil
 }
 
 // GetActivePeerNumber returns the number of active peers

node/node_syncing.go

@@ -67,7 +67,6 @@ SyncingLoop:
 					ctxerror.Log15(utils.GetLogInstance().Debug, err)
 					continue SyncingLoop
 				}
-				node.stateSync.MakeConnectionToPeers()
 			}
 			if node.stateSync.IsOutOfSync(bc) {
 				utils.GetLogInstance().Debug("[SYNC] out of sync, doing syncing")