Merge pull request #364 from scasplte2/move_peerSync_creation

moved peerSynchronizer creation to app

Author: kushti

src/main/scala/scorex/core/app/Application.scala

@@ -40,6 +40,7 @@ trait Application extends ScorexLogging {
 
   protected val features: Seq[PeerFeature]
   protected val additionalMessageSpecs: Seq[MessageSpec[_]]
+  private val featureSerializers: PeerFeature.Serializers = features.map(f => f.featureId -> f.serializer).toMap
 
   //p2p
   private val upnpGateway: Option[UPnPGateway] = if (settings.network.upnpEnabled) UPnP.getValidGateway(settings.network) else None
@@ -50,7 +51,6 @@ trait Application extends ScorexLogging {
     val invSpec = new InvSpec(settings.network.maxInvObjects)
     val requestModifierSpec = new RequestModifierSpec(settings.network.maxInvObjects)
     val modifiersSpec = new ModifiersSpec(settings.network.maxPacketSize)
-    val featureSerializers: PeerFeature.Serializers = features.map(f => f.featureId -> f.serializer).toMap
     Seq(
       GetPeersSpec,
       new PeersSpec(featureSerializers, settings.network.maxPeerSpecObjects),
@@ -89,6 +89,9 @@ trait Application extends ScorexLogging {
   val networkControllerRef: ActorRef = NetworkControllerRef(
     "networkController", settings.network, peerManagerRef, scorexContext)
 
+  val peerSynchronizer: ActorRef = PeerSynchronizerRef("PeerSynchronizer",
+    networkControllerRef, peerManagerRef, settings.network, featureSerializers)
+
   lazy val combinedRoute: Route = CompositeHttpService(actorSystem, apiRoutes, settings.restApi, swaggerConfig).compositeRoute
 
   def run(): Unit = {

src/main/scala/scorex/core/network/NetworkController.scala

@@ -61,11 +61,6 @@ class NetworkController(settings: NetworkSettings,
   private var connections = Map.empty[InetSocketAddress, ConnectedPeer]
   private var unconfirmedConnections = Set.empty[InetSocketAddress]
 
-  //todo: make usage more clear, now we're relying on preStart logic in a actor which is described by a never used val
-  private val featureSerializers: PeerFeature.Serializers = scorexContext.features.map(f => f.featureId -> f.serializer).toMap
-  private val peerSynchronizer: ActorRef = PeerSynchronizerRef("PeerSynchronizer", self, peerManagerRef, settings,
-    featureSerializers)
-
   //check own declared address for validity
   validateDeclaredAddress()
 

src/test/scala/scorex/network/NetworkControllerSpec.scala

@@ -292,6 +292,9 @@ class NetworkControllerSpec extends NetworkTests {
       "networkController", settings.network,
       peerManagerRef, scorexContext, tcpManagerProbe.testActor)
 
+    val peerSynchronizer: ActorRef = PeerSynchronizerRef("PeerSynchronizer",
+      networkControllerRef, peerManagerRef, settings.network, featureSerializers)
+
 
     tcpManagerProbe.expectMsg(Bind(networkControllerRef, settings.network.bindAddress, options = Nil))