ETCM-1018 Replace references to BlockImport by Consensus/ConsensusImpl

Author: Leonor Boga

src/it/scala/io/iohk/ethereum/ledger/BlockImporterItSpec.scala

@@ -3,20 +3,16 @@ package io.iohk.ethereum.ledger
 import akka.actor.ActorRef
 import akka.testkit.TestProbe
 import akka.util.ByteString
-
 import cats.data.NonEmptyList
-
 import monix.execution.Scheduler
 import monix.execution.schedulers.SchedulerService
 
 import scala.concurrent.duration._
-
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.Eventually
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
-
 import io.iohk.ethereum.Fixtures
 import io.iohk.ethereum.Mocks
 import io.iohk.ethereum.NormalPatience
@@ -26,6 +22,7 @@ import io.iohk.ethereum.blockchain.sync.regular.BlockFetcher
 import io.iohk.ethereum.blockchain.sync.regular.BlockImporter
 import io.iohk.ethereum.blockchain.sync.regular.BlockImporter.NewCheckpoint
 import io.iohk.ethereum.checkpointing.CheckpointingTestHelpers
+import io.iohk.ethereum.consensus.Consensus
 import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
 import io.iohk.ethereum.consensus.pow.validators.OmmersValidator
 import io.iohk.ethereum.consensus.pow.validators.StdOmmersValidator
@@ -57,8 +54,7 @@ class BlockImporterItSpec
     override val blockImporter = system.actorOf(
       BlockImporter.props(
         fetcherProbe.ref,
-        mkBlockImport(validators = successValidators),
-        blockchain,
+        mkConsensus(validators = successValidators),
         blockchainReader,
         storagesInstance.storages.stateStorage,
         new BranchResolution(blockchain, blockchainReader),
@@ -171,8 +167,7 @@ class BlockImporterItSpec
     override val blockImporter = system.actorOf(
       BlockImporter.props(
         fetcherProbe.ref,
-        mkBlockImport(validators = successValidators),
-        blockchain,
+        mkConsensus(validators = successValidators),
         blockchainReader,
         storagesInstance.storages.stateStorage,
         new BranchResolution(blockchain, blockchainReader),
@@ -236,7 +231,7 @@ class TestFixture extends TestSetupWithVmAndValidators {
     override val ommersValidator: OmmersValidator = new StdOmmersValidator(blockHeaderValidator)
   }
 
-  override lazy val blockImport: BlockImport = mkBlockImport(
+  override lazy val consensus: Consensus = mkConsensus(
     validators = successValidators,
     blockExecutionOpt = Some(
       new BlockExecution(
@@ -259,8 +254,7 @@ class TestFixture extends TestSetupWithVmAndValidators {
   val blockImporter: ActorRef = system.actorOf(
     BlockImporter.props(
       fetcherProbe.ref,
-      blockImport,
-      blockchain,
+      consensus,
       blockchainReader,
       storagesInstance.storages.stateStorage,
       new BranchResolution(blockchain, blockchainReader),

src/it/scala/io/iohk/ethereum/sync/util/RegularSyncItSpecUtils.scala

@@ -4,14 +4,11 @@ import akka.actor.ActorRef
 import akka.actor.typed
 import akka.actor.typed.scaladsl.adapter._
 import akka.util.ByteString
-
 import cats.effect.Resource
-
 import monix.eval.Task
 import monix.execution.Scheduler
 
 import scala.concurrent.duration._
-
 import io.iohk.ethereum.Mocks.MockValidatorsAlwaysSucceed
 import io.iohk.ethereum.blockchain.sync.PeersClient
 import io.iohk.ethereum.blockchain.sync.SyncProtocol
@@ -30,7 +27,7 @@ import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
 import io.iohk.ethereum.consensus.mining.FullMiningConfig
 import io.iohk.ethereum.consensus.mining.MiningConfig
 import io.iohk.ethereum.consensus.mining.Protocol.NoAdditionalPoWData
-import io.iohk.ethereum.consensus.pow
+import io.iohk.ethereum.consensus.{Consensus, ConsensusImpl, pow}
 import io.iohk.ethereum.consensus.pow.EthashConfig
 import io.iohk.ethereum.consensus.pow.PoWMining
 import io.iohk.ethereum.consensus.pow.validators.ValidatorsExecutor
@@ -103,8 +100,8 @@ object RegularSyncItSpecUtils {
         mining.blockPreparator,
         blockValidation
       )
-    lazy val blockImport: BlockImport =
-      new BlockImport(
+    lazy val blockImport: Consensus =
+      new ConsensusImpl(
         bl,
         blockchainReader,
         blockchainWriter,
@@ -146,7 +143,6 @@ object RegularSyncItSpecUtils {
       BlockImporter.props(
         fetcher.toClassic,
         blockImport,
-        bl,
         blockchainReader,
         storagesInstance.storages.stateStorage,
         new BranchResolution(bl, blockchainReader),
@@ -165,7 +161,6 @@ object RegularSyncItSpecUtils {
         etcPeerManager,
         peerEventBus,
         blockImport,
-        bl,
         blockchainReader,
         storagesInstance.storages.stateStorage,
         new BranchResolution(bl, blockchainReader),

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

@@ -6,9 +6,9 @@ import akka.actor.ActorRef
 import akka.actor.PoisonPill
 import akka.actor.Props
 import akka.actor.Scheduler
-
 import io.iohk.ethereum.blockchain.sync.fast.FastSync
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync
+import io.iohk.ethereum.consensus.Consensus
 import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.db.storage.AppStateStorage
 import io.iohk.ethereum.db.storage.EvmCodeStorage
@@ -18,21 +18,20 @@ import io.iohk.ethereum.db.storage.StateStorage
 import io.iohk.ethereum.domain.Blockchain
 import io.iohk.ethereum.domain.BlockchainReader
 import io.iohk.ethereum.domain.BlockchainWriter
-import io.iohk.ethereum.ledger.BlockImport
 import io.iohk.ethereum.ledger.BranchResolution
 import io.iohk.ethereum.nodebuilder.BlockchainConfigBuilder
 import io.iohk.ethereum.utils.Config.SyncConfig
 
 class SyncController(
-    appStateStorage: AppStateStorage,
     blockchain: Blockchain,
     blockchainReader: BlockchainReader,
     blockchainWriter: BlockchainWriter,
+    appStateStorage: AppStateStorage,
     evmCodeStorage: EvmCodeStorage,
     stateStorage: StateStorage,
     nodeStorage: NodeStorage,
     fastSyncStateStorage: FastSyncStateStorage,
-    blockImport: BlockImport,
+    consensus: Consensus,
     validators: Validators,
     peerEventBus: ActorRef,
     pendingTransactionsManager: ActorRef,
@@ -124,8 +123,7 @@ class SyncController(
         peersClient,
         etcPeerManager,
         peerEventBus,
-        blockImport,
-        blockchain,
+        consensus,
         blockchainReader,
         stateStorage,
         new BranchResolution(blockchain, blockchainReader),
@@ -148,15 +146,15 @@ class SyncController(
 object SyncController {
   // scalastyle:off parameter.number
   def props(
-      appStateStorage: AppStateStorage,
       blockchain: Blockchain,
       blockchainReader: BlockchainReader,
       blockchainWriter: BlockchainWriter,
+      appStateStorage: AppStateStorage,
       evmCodeStorage: EvmCodeStorage,
       stateStorage: StateStorage,
       nodeStorage: NodeStorage,
       syncStateStorage: FastSyncStateStorage,
-      blockImport: BlockImport,
+      consensus: Consensus,
       validators: Validators,
       peerEventBus: ActorRef,
       pendingTransactionsManager: ActorRef,
@@ -168,15 +166,15 @@ object SyncController {
   ): Props =
     Props(
       new SyncController(
-        appStateStorage,
         blockchain,
         blockchainReader,
         blockchainWriter,
+        appStateStorage,
         evmCodeStorage,
         stateStorage,
         nodeStorage,
         syncStateStorage,
-        blockImport,
+        consensus,
         validators,
         peerEventBus,
         pendingTransactionsManager,

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/RegularSync.scala

@@ -10,7 +10,6 @@ import akka.actor.Scheduler
 import akka.actor.SupervisorStrategy
 import akka.actor.typed.scaladsl.adapter._
 import akka.actor.typed.{ActorRef => TypedActorRef}
-
 import io.iohk.ethereum.blockchain.sync.Blacklist
 import io.iohk.ethereum.blockchain.sync.SyncProtocol
 import io.iohk.ethereum.blockchain.sync.SyncProtocol.Status
@@ -19,12 +18,11 @@ import io.iohk.ethereum.blockchain.sync.regular.BlockFetcher.InternalLastBlockIm
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.NewCheckpoint
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.ProgressProtocol
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.ProgressState
+import io.iohk.ethereum.consensus.Consensus
 import io.iohk.ethereum.consensus.validators.BlockValidator
 import io.iohk.ethereum.db.storage.StateStorage
 import io.iohk.ethereum.domain.Block
-import io.iohk.ethereum.domain.Blockchain
 import io.iohk.ethereum.domain.BlockchainReader
-import io.iohk.ethereum.ledger.BlockImport
 import io.iohk.ethereum.ledger.BranchResolution
 import io.iohk.ethereum.nodebuilder.BlockchainConfigBuilder
 import io.iohk.ethereum.utils.ByteStringUtils
@@ -34,8 +32,7 @@ class RegularSync(
     peersClient: ActorRef,
     etcPeerManager: ActorRef,
     peerEventBus: ActorRef,
-    blockImport: BlockImport,
-    blockchain: Blockchain,
+    consensus: Consensus,
     blockchainReader: BlockchainReader,
     stateStorage: StateStorage,
     branchResolution: BranchResolution,
@@ -66,8 +63,7 @@ class RegularSync(
     context.actorOf(
       BlockImporter.props(
         fetcher.toClassic,
-        blockImport,
-        blockchain,
+        consensus,
         blockchainReader,
         stateStorage,
         branchResolution,
@@ -140,8 +136,7 @@ object RegularSync {
       peersClient: ActorRef,
       etcPeerManager: ActorRef,
       peerEventBus: ActorRef,
-      blockImport: BlockImport,
-      blockchain: Blockchain,
+      consensus: Consensus,
       blockchainReader: BlockchainReader,
       stateStorage: StateStorage,
       branchResolution: BranchResolution,
@@ -158,8 +153,7 @@ object RegularSync {
         peersClient,
         etcPeerManager,
         peerEventBus,
-        blockImport,
-        blockchain,
+        consensus,
         blockchainReader,
         stateStorage,
         branchResolution,

src/main/scala/io/iohk/ethereum/consensus/mining/TestMiningBuilder.scala

@@ -20,7 +20,7 @@ trait StdTestMiningBuilder
     with ActorSystemBuilder
     with BlockchainBuilder
     with BlockQueueBuilder
-    with BlockImportBuilder
+    with ConsensusBuilder
     with StorageBuilder
     with BlockchainConfigBuilder
     with NodeKeyBuilder

src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala

@@ -3,20 +3,18 @@ package io.iohk.ethereum.jsonrpc
 import akka.actor.ActorRef
 import akka.util.ByteString
 import akka.util.Timeout
-
 import monix.eval.Task
 import monix.execution.Scheduler
 
 import scala.concurrent.duration._
 import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
-
 import org.bouncycastle.util.encoders.Hex
-
 import io.iohk.ethereum.blockchain.data.GenesisAccount
 import io.iohk.ethereum.blockchain.data.GenesisData
 import io.iohk.ethereum.blockchain.data.GenesisDataLoader
+import io.iohk.ethereum.blockchain.sync.regular.{BlockEnqueued, BlockImportResult, BlockImportedToTop, ChainReorganised}
 import io.iohk.ethereum.consensus.blocks._
 import io.iohk.ethereum.consensus.mining.MiningConfig
 import io.iohk.ethereum.crypto
@@ -34,7 +32,6 @@ import io.iohk.ethereum.domain.BlockchainReader
 import io.iohk.ethereum.domain.BlockchainWriter
 import io.iohk.ethereum.domain.UInt256
 import io.iohk.ethereum.jsonrpc.JsonMethodsImplicits._
-import io.iohk.ethereum.ledger._
 import io.iohk.ethereum.nodebuilder.TestNode
 import io.iohk.ethereum.rlp
 import io.iohk.ethereum.rlp.RLPList
@@ -261,8 +258,8 @@ class TestService(
       getBlockForMining(blockchainReader.getBestBlock().get)
         .flatMap(blockForMining =>
           testModeComponentsProvider
-            .blockImport(preimageCache)
-            .importBlock(blockForMining.block)
+            .evaluateBranchBlock(preimageCache)
+            .evaluateBranchBlock(blockForMining.block)
         )
         .map { res =>
           log.info("Block mining result: " + res)
@@ -301,8 +298,8 @@ class TestService(
         Task.now(Left(JsonRpcError(-1, "block validation failed!", None)))
       case Success(value) =>
         testModeComponentsProvider
-          .blockImport(preimageCache)
-          .importBlock(value)
+          .evaluateBranchBlock(preimageCache)
+          .evaluateBranchBlock(value)
           .flatMap(handleResult(value))
     }