remove Blockchain dependency where it is not needed anymore

Aurélien Richez · Aurélien Richez · commit 13c47db651c6 · 2021-06-23T09:58:14.000+02:00
diff --git a/src/it/scala/io/iohk/ethereum/txExecTest/ContractTest.scala b/src/it/scala/io/iohk/ethereum/txExecTest/ContractTest.scala
@@ -25,7 +25,7 @@ class ContractTest extends AnyFlatSpec with Matchers {
 
     //block only with ether transfers
     val blockValidation =
-      new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+      new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
     val blockExecution =
       new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
     blockExecution.executeAndValidateBlock(fixtures.blockByNumber(1)) shouldBe noErrors
@@ -38,7 +38,7 @@ class ContractTest extends AnyFlatSpec with Matchers {
 
     //contract creation
     val blockValidation =
-      new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+      new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
     val blockExecution =
       new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
     blockExecution.executeAndValidateBlock(fixtures.blockByNumber(2)) shouldBe noErrors
@@ -51,7 +51,7 @@ class ContractTest extends AnyFlatSpec with Matchers {
 
     //block with ether transfers and contract call
     val blockValidation =
-      new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+      new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
     val blockExecution =
       new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
     blockExecution.executeAndValidateBlock(fixtures.blockByNumber(3)) shouldBe noErrors
@@ -64,7 +64,7 @@ class ContractTest extends AnyFlatSpec with Matchers {
 
     //block contains contract paying 2 accounts
     val blockValidation =
-      new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+      new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
     val blockExecution =
       new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
     blockExecution.executeAndValidateBlock(fixtures.blockByNumber(3)) shouldBe noErrors
diff --git a/src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala b/src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala
@@ -79,7 +79,7 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
       val blockchainReader = BlockchainReader(storages)
       val blockchain = BlockchainImpl(storages, blockchainReader)
       val blockValidation =
-        new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+        new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
       val blockExecution =
         new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
       blockExecution.executeAndValidateBlock(fixtures.blockByNumber(blockToExecute)) shouldBe noErrors
diff --git a/src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala b/src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala
@@ -70,7 +70,7 @@ class ForksTest extends AnyFlatSpec with Matchers {
       val blockchainReader = BlockchainReader(storages)
       val blockchain = BlockchainImpl(storages, blockchainReader)
       val blockValidation =
-        new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+        new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
       val blockExecution =
         new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
       blockExecution.executeAndValidateBlock(fixtures.blockByNumber(blockToExecute)) shouldBe noErrors
diff --git a/src/main/scala/io/iohk/ethereum/blockchain/sync/fast/SyncBlocksValidator.scala b/src/main/scala/io/iohk/ethereum/blockchain/sync/fast/SyncBlocksValidator.scala
@@ -3,9 +3,7 @@ package io.iohk.ethereum.blockchain.sync.fast
 import akka.actor.ActorLogging
 import akka.util.ByteString
 import io.iohk.ethereum.consensus.validators.{BlockHeaderError, BlockHeaderValid, Validators}
-import io.iohk.ethereum.consensus.validators.std.StdBlockValidator
-import io.iohk.ethereum.consensus.validators.std.StdBlockValidator.BlockValid
-import io.iohk.ethereum.domain.{BlockBody, BlockHeader, Blockchain, BlockchainReader}
+import io.iohk.ethereum.domain.{BlockBody, BlockHeader, BlockchainReader}
 
 trait SyncBlocksValidator { this: ActorLogging =>
 
diff --git a/src/main/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSkeleton.scala b/src/main/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSkeleton.scala
@@ -22,7 +22,6 @@ import io.iohk.ethereum.utils.ByteUtils.or
   * This is a skeleton for a generic [[io.iohk.ethereum.consensus.blocks.BlockGenerator BlockGenerator]].
   */
 abstract class BlockGeneratorSkeleton(
-    blockchain: Blockchain,
     blockchainConfig: BlockchainConfig,
     consensusConfig: ConsensusConfig,
     difficultyCalc: DifficultyCalculator,
diff --git a/src/main/scala/io/iohk/ethereum/consensus/blocks/NoOmmersBlockGenerator.scala b/src/main/scala/io/iohk/ethereum/consensus/blocks/NoOmmersBlockGenerator.scala
@@ -15,7 +15,6 @@ abstract class NoOmmersBlockGenerator(
     difficultyCalc: DifficultyCalculator,
     blockTimestampProvider: BlockTimestampProvider = DefaultBlockTimestampProvider
 ) extends BlockGeneratorSkeleton(
-      blockchain,
       blockchainConfig,
       consensusConfig,
       difficultyCalc,
diff --git a/src/main/scala/io/iohk/ethereum/consensus/pow/PoWConsensus.scala b/src/main/scala/io/iohk/ethereum/consensus/pow/PoWConsensus.scala
@@ -162,7 +162,6 @@ class PoWConsensus private (
 
         new PoWBlockGeneratorImpl(
           validators = _validators,
-          blockchain = blockchain,
           blockchainReader = blockchainReader,
           blockchainConfig = blockchainConfig,
           consensusConfig = config.generic,
@@ -246,7 +245,6 @@ object PoWConsensus {
     )
 
     val blockGenerator: PoWBlockGeneratorImpl = buildBlockGenerator(
-      blockchain,
       blockchainReader,
       blockchainConfig,
       config,
@@ -269,7 +267,6 @@ object PoWConsensus {
   }
 
   private def buildBlockGenerator(
-      blockchain: BlockchainImpl,
       blockchainReader: BlockchainReader,
       blockchainConfig: BlockchainConfig,
       config: FullConsensusConfig[EthashConfig],
@@ -281,7 +278,6 @@ object PoWConsensus {
     case RestrictedPoWMinerData(key) =>
       new RestrictedPoWBlockGeneratorImpl(
         validators = validators,
-        blockchain = blockchain,
         blockchainReader = blockchainReader,
         blockchainConfig = blockchainConfig,
         consensusConfig = config.generic,
@@ -293,7 +289,6 @@ object PoWConsensus {
     case NoAdditionalPoWData =>
       new PoWBlockGeneratorImpl(
         validators = validators,
-        blockchain = blockchain,
         blockchainReader = blockchainReader,
         blockchainConfig = blockchainConfig,
         consensusConfig = config.generic,
diff --git a/src/main/scala/io/iohk/ethereum/consensus/pow/blocks/PoWBlockGenerator.scala b/src/main/scala/io/iohk/ethereum/consensus/pow/blocks/PoWBlockGenerator.scala
@@ -24,15 +24,13 @@ trait PoWBlockGenerator extends TestBlockGenerator {
 
 class PoWBlockGeneratorImpl(
     validators: ValidatorsExecutor,
-    blockchain: Blockchain,
     blockchainReader: BlockchainReader,
     blockchainConfig: BlockchainConfig,
     consensusConfig: ConsensusConfig,
     val blockPreparator: BlockPreparator,
     difficultyCalc: DifficultyCalculator,
     blockTimestampProvider: BlockTimestampProvider = DefaultBlockTimestampProvider
 ) extends BlockGeneratorSkeleton(
-      blockchain,
       blockchainConfig,
       consensusConfig,
       difficultyCalc,
@@ -81,7 +79,7 @@ class PoWBlockGeneratorImpl(
     val blockNumber = pHeader.number + 1
     val parentHash = pHeader.hash
 
-    val ommers = validators.ommersValidator.validate(parentHash, blockNumber, x, blockchain, blockchainReader) match {
+    val ommers = validators.ommersValidator.validate(parentHash, blockNumber, x, blockchainReader) match {
       case Left(_) => emptyX
       case Right(_) => x
     }
@@ -106,7 +104,6 @@ class PoWBlockGeneratorImpl(
   def withBlockTimestampProvider(blockTimestampProvider: BlockTimestampProvider): PoWBlockGeneratorImpl =
     new PoWBlockGeneratorImpl(
       validators,
-      blockchain,
       blockchainReader,
       blockchainConfig,
       consensusConfig,
diff --git a/src/main/scala/io/iohk/ethereum/consensus/pow/blocks/RestrictedPoWBlockGeneratorImpl.scala b/src/main/scala/io/iohk/ethereum/consensus/pow/blocks/RestrictedPoWBlockGeneratorImpl.scala
@@ -5,15 +5,14 @@ import io.iohk.ethereum.consensus.blocks.{BlockTimestampProvider, DefaultBlockTi
 import io.iohk.ethereum.consensus.difficulty.DifficultyCalculator
 import io.iohk.ethereum.consensus.pow.RestrictedPoWSigner
 import io.iohk.ethereum.consensus.pow.validators.ValidatorsExecutor
-import io.iohk.ethereum.domain.{Address, Block, Blockchain, BlockchainReader, SignedTransaction}
+import io.iohk.ethereum.domain.{Address, Block, BlockchainReader, SignedTransaction}
 import io.iohk.ethereum.ledger.{BlockPreparator, InMemoryWorldStateProxy}
 import io.iohk.ethereum.utils.BlockchainConfig
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair
 import io.iohk.ethereum.consensus.ConsensusMetrics
 
 class RestrictedPoWBlockGeneratorImpl(
     validators: ValidatorsExecutor,
-    blockchain: Blockchain,
     blockchainReader: BlockchainReader,
     blockchainConfig: BlockchainConfig,
     consensusConfig: ConsensusConfig,
@@ -23,7 +22,6 @@ class RestrictedPoWBlockGeneratorImpl(
     blockTimestampProvider: BlockTimestampProvider = DefaultBlockTimestampProvider
 ) extends PoWBlockGeneratorImpl(
       validators,
-      blockchain,
       blockchainReader,
       blockchainConfig,
       consensusConfig,
@@ -44,7 +42,7 @@ class RestrictedPoWBlockGeneratorImpl(
     val parentHash = pHeader.hash
 
     val validatedOmmers =
-      validators.ommersValidator.validate(parentHash, blockNumber, ommers, blockchain, blockchainReader) match {
+      validators.ommersValidator.validate(parentHash, blockNumber, ommers, blockchainReader) match {
         case Left(_) => emptyX
         case Right(_) => ommers
       }
diff --git a/src/main/scala/io/iohk/ethereum/consensus/pow/validators/OmmersValidator.scala b/src/main/scala/io/iohk/ethereum/consensus/pow/validators/OmmersValidator.scala
@@ -4,7 +4,7 @@ import akka.util.ByteString
 import io.iohk.ethereum.consensus.pow.validators.OmmersValidator.{OmmersError, OmmersValid}
 import io.iohk.ethereum.consensus.validators.BlockHeaderError
 import io.iohk.ethereum.consensus.{GetBlockHeaderByHash, GetNBlocksBack}
-import io.iohk.ethereum.domain.{Block, BlockHeader, Blockchain, BlockchainReader}
+import io.iohk.ethereum.domain.{Block, BlockHeader, BlockchainReader}
 
 trait OmmersValidator {
 
@@ -20,7 +20,6 @@ trait OmmersValidator {
       parentHash: ByteString,
       blockNumber: BigInt,
       ommers: Seq[BlockHeader],
-      blockchain: Blockchain,
       blockchainReader: BlockchainReader
   ): Either[OmmersError, OmmersValid] = {
 
diff --git a/src/main/scala/io/iohk/ethereum/ledger/BlockValidation.scala b/src/main/scala/io/iohk/ethereum/ledger/BlockValidation.scala
@@ -2,12 +2,11 @@ package io.iohk.ethereum.ledger
 
 import akka.util.ByteString
 import io.iohk.ethereum.consensus.Consensus
-import io.iohk.ethereum.domain.{Block, BlockHeader, Blockchain, BlockchainReader, Receipt}
+import io.iohk.ethereum.domain.{Block, BlockHeader, BlockchainReader, Receipt}
 import io.iohk.ethereum.ledger.BlockExecutionError.ValidationBeforeExecError
 
 class BlockValidation(
     consensus: Consensus,
-    blockchain: Blockchain,
     blockchainReader: BlockchainReader,
     blockQueue: BlockQueue
 ) {
diff --git a/src/main/scala/io/iohk/ethereum/ledger/Ledger.scala b/src/main/scala/io/iohk/ethereum/ledger/Ledger.scala
@@ -101,7 +101,7 @@ class LedgerImpl(
 
   private[ledger] val blockRewardCalculator = _blockPreparator.blockRewardCalculator
 
-  private[ledger] lazy val blockValidation = new BlockValidation(consensus, blockchain, blockchainReader, blockQueue)
+  private[ledger] lazy val blockValidation = new BlockValidation(consensus, blockchainReader, blockQueue)
   private[ledger] lazy val blockExecution =
     new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
   private[ledger] val branchResolution = new BranchResolution(blockchain, blockchainReader)
diff --git a/src/test/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSpec.scala b/src/test/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSpec.scala
@@ -710,7 +710,7 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
     lazy val blockGenerator = consensus.blockGenerator.withBlockTimestampProvider(blockTimestampProvider)
 
     lazy val blockValidation =
-      new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+      new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
     lazy val blockExecution =
       new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
 
diff --git a/src/test/scala/io/iohk/ethereum/consensus/pow/validators/StdOmmersValidatorSpec.scala b/src/test/scala/io/iohk/ethereum/consensus/pow/validators/StdOmmersValidatorSpec.scala
@@ -13,7 +13,7 @@ import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 class StdOmmersValidatorSpec extends AnyFlatSpec with Matchers with ScalaCheckPropertyChecks with ObjectGenerators {
 
   it should "validate correctly a valid list of ommers" in new BlockUtils {
-    ommersValidator.validate(ommersBlockParentHash, ommersBlockNumber, ommers, blockchain, blockchainReader) match {
+    ommersValidator.validate(ommersBlockParentHash, ommersBlockNumber, ommers, blockchainReader) match {
       case Right(_) => succeed
       case Left(err) => fail(s"Unexpected validation error: $err")
     }
@@ -24,7 +24,6 @@ class StdOmmersValidatorSpec extends AnyFlatSpec with Matchers with ScalaCheckPr
       ommersBlockParentHash,
       ommersBlockNumber,
       Seq(ommer1, ommer2, ommer2),
-      blockchain,
       blockchainReader
     ) match {
       case Left(OmmersLengthError) => succeed
@@ -40,7 +39,6 @@ class StdOmmersValidatorSpec extends AnyFlatSpec with Matchers with ScalaCheckPr
       ommersBlockParentHash,
       ommersBlockNumber,
       Seq(invalidOmmer1, ommer2),
-      blockchain,
       blockchainReader
     ) match {
       case Left(OmmersHeaderError(List(_))) => succeed
@@ -54,7 +52,6 @@ class StdOmmersValidatorSpec extends AnyFlatSpec with Matchers with ScalaCheckPr
       ommersBlockParentHash,
       ommersBlockNumber,
       Seq(block93.body.uncleNodesList.head, ommer2),
-      blockchain,
       blockchainReader
     ) match {
       case Left(OmmersUsedBeforeError) => succeed
@@ -68,7 +65,6 @@ class StdOmmersValidatorSpec extends AnyFlatSpec with Matchers with ScalaCheckPr
       ommersBlockParentHash,
       ommersBlockNumber,
       Seq(ommer1, block92.header),
-      blockchain,
       blockchainReader
     ) match {
       case Left(OmmerIsAncestorError) => succeed
@@ -111,7 +107,6 @@ class StdOmmersValidatorSpec extends AnyFlatSpec with Matchers with ScalaCheckPr
       ommersBlockParentHash,
       ommersBlockNumber,
       Seq(ommer1, block90.header),
-      blockchain,
       blockchainReader
     ) match {
       case Left(OmmerParentIsNotAncestorError) => succeed
@@ -124,7 +119,6 @@ class StdOmmersValidatorSpec extends AnyFlatSpec with Matchers with ScalaCheckPr
       ommersBlockParentHash,
       ommersBlockNumber,
       Seq(ommer1, ommer1),
-      blockchain,
       blockchainReader
     ) match {
       case Left(OmmersDuplicatedError) => succeed
diff --git a/src/test/scala/io/iohk/ethereum/jsonrpc/EthMiningServiceSpec.scala b/src/test/scala/io/iohk/ethereum/jsonrpc/EthMiningServiceSpec.scala
@@ -237,7 +237,6 @@ class EthMiningServiceSpec
 
     lazy val restrictedGenerator = new RestrictedPoWBlockGeneratorImpl(
       validators = MockValidatorsAlwaysSucceed,
-      blockchain = blockchain,
       blockchainReader = blockchainReader,
       blockchainConfig = blockchainConfig,
       consensusConfig = consensusConfig,
diff --git a/src/test/scala/io/iohk/ethereum/ledger/BlockExecutionSpec.scala b/src/test/scala/io/iohk/ethereum/ledger/BlockExecutionSpec.scala
@@ -46,7 +46,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         val mockValidators = new MockValidatorsFailOnSpecificBlockNumber(block1.header.number)
         val newConsensus: TestConsensus = consensus.withVM(vm).withValidators(mockValidators)
         val blockValidation =
-          new BlockValidation(newConsensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+          new BlockValidation(newConsensus, blockchainReader, BlockQueue(blockchain, syncConfig))
         val blockExecution =
           new BlockExecution(
             blockchain,
@@ -87,7 +87,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         val mockValidators = new MockValidatorsFailOnSpecificBlockNumber(block2.header.number)
         val newConsensus: TestConsensus = consensus.withVM(mockVm).withValidators(mockValidators)
         val blockValidation =
-          new BlockValidation(newConsensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+          new BlockValidation(newConsensus, blockchainReader, BlockQueue(blockchain, syncConfig))
         val blockExecution =
           new BlockExecution(
             blockchain,
@@ -121,7 +121,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         val mockValidators = new MockValidatorsFailOnSpecificBlockNumber(chain.last.number)
         val newConsensus: TestConsensus = consensus.withVM(mockVm).withValidators(mockValidators)
         val blockValidation =
-          new BlockValidation(newConsensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+          new BlockValidation(newConsensus, blockchainReader, BlockQueue(blockchain, syncConfig))
         val blockExecution =
           new BlockExecution(
             blockchain,
@@ -147,7 +147,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         val mockValidators = MockValidatorsAlwaysSucceed
         val newConsensus: TestConsensus = consensus.withVM(vm).withValidators(mockValidators)
         val blockValidation =
-          new BlockValidation(newConsensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+          new BlockValidation(newConsensus, blockchainReader, BlockQueue(blockchain, syncConfig))
         val blockExecution =
           new BlockExecution(
             blockchain,
@@ -205,7 +205,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         val newConsensus: TestConsensus = consensus.withVM(mockVm)
 
         val blockValidation =
-          new BlockValidation(newConsensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+          new BlockValidation(newConsensus, blockchainReader, BlockQueue(blockchain, syncConfig))
         val blockExecution =
           new BlockExecution(
             blockchain,
@@ -280,7 +280,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
           // Beware we are not using `ledger`
           val newConsensus = consensus.withValidators(mockValidators).withVM(mockVm)
           val blockValidation =
-            new BlockValidation(newConsensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+            new BlockValidation(newConsensus, blockchainReader, BlockQueue(blockchain, syncConfig))
           val blockExecution =
             new BlockExecution(
               blockchain,
@@ -350,7 +350,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
   trait BlockExecutionTestSetup extends BlockchainSetup {
 
     val blockValidation =
-      new BlockValidation(consensus, blockchain, blockchainReader, BlockQueue(blockchain, syncConfig))
+      new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, syncConfig))
     val blockExecution =
       new BlockExecution(blockchain, blockchainReader, blockchainConfig, consensus.blockPreparator, blockValidation)
 
diff --git a/src/test/scala/io/iohk/ethereum/ledger/BlockValidationSpec.scala b/src/test/scala/io/iohk/ethereum/ledger/BlockValidationSpec.scala
@@ -51,7 +51,6 @@ class BlockValidationSpec extends AnyWordSpec with Matchers with MockFactory {
     def blockValidation: BlockValidation =
       new BlockValidation(
         setup.consensus,
-        setup.blockchain,
         setup.blockchainReader,
         BlockQueue(setup.blockchain, setup.syncConfig)
       )
