Merge remote-tracking branch 'origin/phase/beta1' into feature/rpcFixes

Author: LukasGasior1

src/main/scala/io/iohk/ethereum/blockchain/sync/FastSync.scala

@@ -171,20 +171,10 @@ trait FastSync {
 
     syncStateStorageActor ! fastSyncStateStorage
 
-    private val syncStatePersistCancellable =
-      scheduler.schedule(persistStateSnapshotInterval, persistStateSnapshotInterval) {
-        syncStateStorageActor ! SyncState(
-          initialSyncState.targetBlock,
-          requestedMptNodes.values.flatten.toSeq.distinct ++ mptNodesQueue,
-          requestedNonMptNodes.values.flatten.toSeq.distinct ++ nonMptNodesQueue,
-          requestedBlockBodies.values.flatten.toSeq.distinct ++ blockBodiesQueue,
-          requestedReceipts.values.flatten.toSeq.distinct ++ receiptsQueue,
-          downloadedNodesCount,
-          bestBlockHeaderNumber)
-      }
-
+    private val syncStatePersistCancellable = scheduler.schedule(persistStateSnapshotInterval, persistStateSnapshotInterval, self, PersistSyncState)
     private val heartBeat = scheduler.schedule(syncRetryInterval, syncRetryInterval * 2, self, ProcessSyncing)
 
+    // scalastyle:off cyclomatic.complexity
     def receive: Receive = handlePeerUpdates orElse {
       case EnqueueNodes(hashes) =>
         hashes.foreach {
@@ -229,6 +219,20 @@ trait FastSync {
 
       case PrintStatus =>
         printStatus()
+
+      case PersistSyncState =>
+        persistSyncState()
+    }
+
+    private def persistSyncState(): Unit = {
+      syncStateStorageActor ! SyncState(
+        initialSyncState.targetBlock,
+        requestedMptNodes.values.flatten.toSeq.distinct ++ mptNodesQueue,
+        requestedNonMptNodes.values.flatten.toSeq.distinct ++ nonMptNodesQueue,
+        requestedBlockBodies.values.flatten.toSeq.distinct ++ blockBodiesQueue,
+        requestedReceipts.values.flatten.toSeq.distinct ++ receiptsQueue,
+        downloadedNodesCount,
+        bestBlockHeaderNumber)
     }
 
     private def printStatus() = {
@@ -427,6 +431,7 @@ object FastSync {
   private case object TargetBlockTimeout
 
   private case object ProcessSyncing
+  private case object PersistSyncState
 
   case class SyncState(
     targetBlock: BlockHeader,

src/main/scala/io/iohk/ethereum/network/discovery/PeerDiscoveryManager.scala

@@ -34,10 +34,7 @@ class PeerDiscoveryManager(
 
   if (discoveryConfig.discoveryEnabled) {
     discoveryListener ! DiscoveryListener.Subscribe
-
-    context.system.scheduler.schedule(discoveryConfig.scanInitialDelay, discoveryConfig.scanInterval) {
-      scan()
-    }
+    context.system.scheduler.schedule(discoveryConfig.scanInitialDelay, discoveryConfig.scanInterval, self, Scan)
   }
 
   def scan(): Unit = {
@@ -78,6 +75,8 @@ class PeerDiscoveryManager(
 
     case GetDiscoveredNodes =>
       sender() ! DiscoveredNodes(nodes.values.toSet)
+
+    case Scan => scan()
   }
 
   private def sendPing(toNodeId: ByteString, toAddr: InetSocketAddress): Unit = {
@@ -130,4 +129,6 @@ object PeerDiscoveryManager {
 
   case object GetDiscoveredNodes
   case class DiscoveredNodes(nodes: Set[Node])
+
+  private case object Scan
 }