ETCM-1058 Fix unit tests

Author: Leonor Boga

src/test/scala/io/iohk/ethereum/blockchain/sync/ScenarioSetup.scala

@@ -69,28 +69,32 @@ trait ScenarioSetup extends StdTestMiningBuilder with StxLedgerBuilder {
   protected def newTestMining(validators: Validators = mining.validators, vm: VMImpl = mining.vm): Mining =
     mining.withValidators(validators).withVM(vm)
 
+  protected def mkBlockExecution(validators: Validators = validators) = {
+    val consensuz = mining.withValidators(validators).withVM(new Mocks.MockVM())
+    val blockValidation = new BlockValidation(consensuz, blockchainReader, blockQueue)
+    new BlockExecution(
+      blockchain,
+      blockchainReader,
+      blockchainWriter,
+      storagesInstance.storages.evmCodeStorage,
+      consensuz.blockPreparator,
+      blockValidation
+    )
+  }
+
   protected def mkConsensus(
       validators: Validators = validators,
       blockExecutionOpt: Option[BlockExecution] = None
   ): Consensus = {
-    val consensuz = mining.withValidators(validators).withVM(new Mocks.MockVM())
-    val blockValidation = new BlockValidation(consensuz, blockchainReader, blockQueue)
+    val testMining = mining.withValidators(validators).withVM(new Mocks.MockVM())
+    val blockValidation = new BlockValidation(testMining, blockchainReader, blockQueue)
     new ConsensusImpl(
       blockchain,
       blockchainReader,
       blockchainWriter,
       blockQueue,
       blockValidation,
-      blockExecutionOpt.getOrElse(
-        new BlockExecution(
-          blockchain,
-          blockchainReader,
-          blockchainWriter,
-          storagesInstance.storages.evmCodeStorage,
-          consensuz.blockPreparator,
-          blockValidation
-        )
-      ),
+      blockExecutionOpt.getOrElse(mkBlockExecution(validators)),
       Scheduler(system.dispatchers.lookup("validation-context"))
     )
   }

src/test/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSpec.scala

@@ -109,7 +109,7 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
     )
 
     // Import Block, to create some existing state
-    blockImport.importBlock(fullBlock).runSyncUnsafe()
+    consensus.evaluateBranchBlock(fullBlock).runSyncUnsafe()
 
     // Create new pending block, with updated stateRootHash
     val pendBlockAndState = blockGenerator.generateBlock(
@@ -690,9 +690,9 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
     lazy val blockGenerator: TestBlockGenerator =
       mining.blockGenerator.withBlockTimestampProvider(blockTimestampProvider)
 
-    lazy val blockValidation =
+    override lazy val blockValidation =
       new BlockValidation(mining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
-    lazy val blockExecution =
+    override lazy val blockExecution =
       new BlockExecution(
         blockchain,
         blockchainReader,

src/test/scala/io/iohk/ethereum/ledger/BlockExecutionSpec.scala

@@ -61,9 +61,9 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
 
         val mockValidators = new MockValidatorsFailOnSpecificBlockNumber(block1.header.number)
         val newMining: TestMining = mining.withVM(vm).withValidators(mockValidators)
-        val blockValidation =
+        override lazy val blockValidation =
           new BlockValidation(newMining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
-        val blockExecution =
+        override lazy val blockExecution =
           new BlockExecution(
             blockchain,
             blockchainReader,
@@ -103,9 +103,9 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         )
         val mockValidators = new MockValidatorsFailOnSpecificBlockNumber(block2.header.number)
         val newMining: TestMining = mining.withVM(mockVm).withValidators(mockValidators)
-        val blockValidation =
+        override lazy val blockValidation =
           new BlockValidation(newMining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
-        val blockExecution =
+        override lazy val blockExecution =
           new BlockExecution(
             blockchain,
             blockchainReader,
@@ -138,9 +138,9 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         )
         val mockValidators = new MockValidatorsFailOnSpecificBlockNumber(chain.last.number)
         val newMining: TestMining = mining.withVM(mockVm).withValidators(mockValidators)
-        val blockValidation =
+        override lazy val blockValidation =
           new BlockValidation(newMining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
-        val blockExecution =
+        override lazy val blockExecution =
           new BlockExecution(
             blockchain,
             blockchainReader,
@@ -169,9 +169,9 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
 
         val mockValidators = MockValidatorsAlwaysSucceed
         val newMining: TestMining = mining.withVM(vm).withValidators(mockValidators)
-        val blockValidation =
+        override lazy val blockValidation =
           new BlockValidation(newMining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
-        val blockExecution =
+        override lazy val blockExecution =
           new BlockExecution(
             blockchain,
             blockchainReader,
@@ -212,7 +212,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
 
         txsExecResult.isRight shouldBe true
 
-        val BlockResult(resultingWorldState, resultingGasUsed, resultingReceipts) = txsExecResult.toOption.get
+        val BlockResult(_, resultingGasUsed, resultingReceipts) = txsExecResult.toOption.get
         resultingGasUsed shouldBe 0
         resultingReceipts shouldBe Nil
       }
@@ -236,9 +236,9 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
 
         val newMining: TestMining = mining.withVM(mockVm)
 
-        val blockValidation =
+        override lazy val blockValidation =
           new BlockValidation(newMining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
-        val blockExecution =
+        override lazy val blockExecution =
           new BlockExecution(
             blockchain,
             blockchainReader,
@@ -434,7 +434,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         )
         val block = Block(blockHeader, blockBodyWithOmmers)
 
-        val blockExecResult = blockImport.blockExecution.executeAndValidateBlock(block)
+        val blockExecResult = blockExecution.executeAndValidateBlock(block)
         assert(blockExecResult.isRight)
       }
     }
@@ -481,7 +481,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
       val block = Block(blockHeader, validBlockBodyWithNoTxs)
 
       assert(seqFailingValidators.forall { _ =>
-        val blockExecResult = blockImport.blockExecution.executeAndValidateBlock(block)
+        val blockExecResult = blockExecution.executeAndValidateBlock(block)
 
         blockExecResult.left.forall {
           case _: BlockExecutionError.ValidationBeforeExecError => true
@@ -530,12 +530,12 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
       )
 
       forAll(table) { (stateRootHash, cumulativeGasUsedBlock, validators) =>
-        val blockImport = mkBlockImport(validators = validators)
+        val blockExecution = mkBlockExecution(validators = validators)
         val blockHeader: BlockHeader =
           validBlockHeader.copy(gasUsed = cumulativeGasUsedBlock, stateRoot = stateRootHash)
         val block = Block(blockHeader, validBlockBodyWithNoTxs)
 
-        val blockExecResult = blockImport.blockExecution.executeAndValidateBlock(block)
+        val blockExecResult = blockExecution.executeAndValidateBlock(block)
 
         assert(blockExecResult match {
           case Left(_: BlockExecutionError.ValidationAfterExecError) => true
@@ -585,7 +585,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         val validBlockBodyWithTxs: BlockBody = validBlockBodyWithNoTxs.copy(transactionList = Seq(stx1.tx, stx2.tx))
         val block = Block(validBlockHeader, validBlockBodyWithTxs)
 
-        val txsExecResult = blockImport.blockExecution.executeBlockTransactions(block, initialWorld)
+        val txsExecResult = blockExecution.executeBlockTransactions(block, initialWorld)
 
         assert(txsExecResult.isRight)
         val BlockResult(resultingWorldState, resultingGasUsed, resultingReceipts) = txsExecResult.toOption.get
@@ -641,7 +641,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         val blockWithCorrectStateAndGasUsed = block.copy(
           header = block.header.copy(stateRoot = blockExpectedStateRoot, gasUsed = gasUsedReceipt2)
         )
-        assert(blockImport.blockExecution.executeAndValidateBlock(blockWithCorrectStateAndGasUsed).isRight)
+        assert(blockExecution.executeAndValidateBlock(blockWithCorrectStateAndGasUsed).isRight)
       }
     }
 
@@ -662,7 +662,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
       }
 
       // We don't care about block txs in this test
-      blockImport.blockExecution.executeBlockTransactions(
+      blockExecution.executeBlockTransactions(
         proDaoBlock.copy(body = proDaoBlock.body.copy(transactionList = Seq.empty)),
         initialWorld
       )
@@ -675,7 +675,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
       }
 
       // We don't care about block txs in this test
-      blockImport.blockExecution.executeBlockTransactions(
+      blockExecution.executeBlockTransactions(
         proDaoBlock.copy(body = proDaoBlock.body.copy(transactionList = Seq.empty)),
         initialWorld
       )
@@ -684,9 +684,9 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
 
   trait BlockExecutionTestSetup extends BlockchainSetup {
 
-    val blockValidation =
+    override lazy val blockValidation =
       new BlockValidation(mining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
-    val blockExecution =
+    override lazy val blockExecution =
       new BlockExecution(
         blockchain,
         blockchainReader,