Merge branch 'develop' into update_libraries

input-output-hk · Sep 28, 2020 · 46141fa · 46141fa
2 parents 0af25e1 + 51be0f4
commit 46141fa
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 1,428 deletions.
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -388,8 +388,6 @@ mantis {
     # Sets max number of blocks that can be stored in queue to import on fetcher side
     # Warning! This setting affects ability to go back in case of branch resolution so it should not be too low
     max-fetcher-queue-size = 1000
-
-    use-new-regular-sync = true
   }
 
   pruning {

diff --git a/src/main/scala/io/iohk/ethereum/blockchain/sync/SyncController.scala b/src/main/scala/io/iohk/ethereum/blockchain/sync/SyncController.scala
@@ -1,7 +1,7 @@
 package io.iohk.ethereum.blockchain.sync
 
 import akka.actor.{Actor, ActorLogging, ActorRef, PoisonPill, Props, Scheduler}
-import io.iohk.ethereum.blockchain.sync.regular.{OldRegularSync, RegularSync}
+import io.iohk.ethereum.blockchain.sync.regular.RegularSync
 import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.db.storage.{AppStateStorage, FastSyncStateStorage}
 import io.iohk.ethereum.domain.Blockchain
@@ -85,9 +85,7 @@ class SyncController(
     context become runningFastSync(fastSync)
   }
 
-  def startRegularSync(): Unit = if (syncConfig.useNewRegularSync) startNewRegularSync() else startOldRegularSync()
-
-  def startNewRegularSync(): Unit = {
+  def startRegularSync(): Unit = {
     val peersClient = context.actorOf(PeersClient.props(etcPeerManager, peerEventBus, syncConfig, scheduler), "peers-client")
     val regularSync = context.actorOf(
       RegularSync.props(
@@ -100,29 +98,12 @@ class SyncController(
         ommersPool,
         pendingTransactionsManager,
         scheduler),
-      "new-regular-sync"
+      "regular-sync"
     )
     regularSync ! RegularSync.Start
     context become runningRegularSync(regularSync)
   }
 
-  def startOldRegularSync(): Unit = {
-    val regularSync = context.actorOf(OldRegularSync.props(
-      appStateStorage = appStateStorage,
-      etcPeerManager = etcPeerManager,
-      peerEventBus = peerEventBus,
-      ommersPool = ommersPool,
-      pendingTransactionsManager = pendingTransactionsManager,
-      broadcaster = new BlockBroadcast(etcPeerManager, syncConfig),
-      ledger = ledger,
-      blockchain = blockchain,
-      syncConfig = syncConfig,
-      scheduler = scheduler
-    ), "old-regular-sync")
-
-    regularSync ! OldRegularSync.Start
-    context become runningRegularSync(regularSync)
-  }
 }
 
 object SyncController {