ETCM-944 Fix tests

Author: Leonor Boga

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

@@ -141,7 +141,7 @@ class BlockImporterItSpec
   "BlockImporter" should "not discard blocks of the main chain if the reorganisation failed" in {
 
     //ledger with not mocked blockExecution
-    val ledger = new TestLedgerImpl(successValidators)
+    val ledger = new TestLedgerImplNotMockedBlockExecution(successValidators)
     val blockImporter = system.actorOf(
       BlockImporter.props(
         fetcherProbe.ref,
@@ -253,7 +253,7 @@ class BlockImporterItSpec
     val newBlock: Block = getBlock(genesisBlock.number + 5, difficulty = 104, parent = parent.header.hash)
     val invalidBlock = newBlock.copy(header = newBlock.header.copy(beneficiary = Address(111).bytes))
 
-    val ledger = new TestLedgerImpl(successValidators)
+    val ledger = new TestLedgerImplNotMockedBlockExecution(successValidators)
     val blockImporter = system.actorOf(
       BlockImporter.props(
         fetcherProbe.ref,
@@ -271,7 +271,6 @@ class BlockImporterItSpec
     blockImporter ! BlockFetcher.PickedBlocks(NonEmptyList.fromListUnsafe(List(invalidBlock)))
 
     eventually {
-
       val msg = fetcherProbe
         .fishForMessage(Timeouts.longTimeout) {
           case BlockFetcher.FetchStateNode(_, _) => true

src/it/scala/io/iohk/ethereum/txExecTest/ContractTest.scala

@@ -1,25 +1,22 @@
 package io.iohk.ethereum.txExecTest
 
-import java.util.concurrent.Executors
-import io.iohk.ethereum.domain.{BlockchainImpl, BlockchainStorages, Receipt}
-import io.iohk.ethereum.ledger.{BlockExecution, BlockQueue, BlockValidation, Ledger}
+import io.iohk.ethereum.domain.{BlockchainImpl, Receipt}
+import io.iohk.ethereum.ledger.{BlockExecution, BlockQueue, BlockValidation}
 import io.iohk.ethereum.txExecTest.util.FixtureProvider
 import io.iohk.ethereum.utils.Config
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
-import scala.concurrent.ExecutionContext
-
 class ContractTest extends AnyFlatSpec with Matchers {
   val blockchainConfig = Config.blockchains.blockchainConfig
   val syncConfig = Config.SyncConfig(Config.config)
-  val vm = new Ledger.VMImpl
-  val ec = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(4))
   val noErrors = a[Right[_, Seq[Receipt]]]
 
   "Ledger" should "execute and validate" in new ScenarioSetup {
     val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract")
-    val testBlockchainStorages = FixtureProvider.prepareStorages(2, fixtures)
+    lazy val testBlockchainStorages = FixtureProvider.prepareStorages(2, fixtures)
+
+    override lazy val blockchain = BlockchainImpl(testBlockchainStorages)
 
     //block only with ether transfers
     val blockValidation = new BlockValidation(consensus, blockchain, BlockQueue(blockchain, syncConfig))

src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala

@@ -1,15 +1,12 @@
 package io.iohk.ethereum.txExecTest
 
-import java.util.concurrent.Executors
-import io.iohk.ethereum.domain.{Address, BlockchainImpl, Receipt, UInt256}
-import io.iohk.ethereum.ledger._
+import io.iohk.ethereum.domain.{Address, Receipt, UInt256}
+import io.iohk.ethereum.ledger.{BlockExecution, BlockQueue, BlockValidation}
 import io.iohk.ethereum.txExecTest.util.FixtureProvider
 import io.iohk.ethereum.utils.{BlockchainConfig, ForkBlockNumbers, MonetaryPolicyConfig}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
-import scala.concurrent.ExecutionContext
-
 class ECIP1017Test extends AnyFlatSpec with Matchers {
 
   val EraDuration = 3
@@ -53,13 +50,9 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
       gasTieBreaker = false,
       treasuryAddress = Address(0)
     )
-    val ec = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(4))
-
     val noErrors = a[Right[_, Seq[Receipt]]]
   }
 
-  val vm = new Ledger.VMImpl
-
   /**
     * Tests the block reward calculation through out all the monetary policy through all the eras till block
     * mining reward goes to zero. Block mining reward is tested till era 200 (that starts at block number 602)
@@ -72,11 +65,9 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
     val startBlock = 1
     val endBlock = 602
 
-    protected val testBlockchainStorages = FixtureProvider.prepareStorages(startBlock, fixtures)
+    protected val testBlockchainStorages = FixtureProvider.prepareStorages(endBlock, fixtures)
 
     (startBlock to endBlock) foreach { blockToExecute =>
-      val storages = FixtureProvider.prepareStorages(blockToExecute - 1, fixtures)
-      val blockchain = BlockchainImpl(storages)
       val blockValidation = new BlockValidation(consensus, blockchain, BlockQueue(blockchain, syncConfig))
       val blockExecution = new BlockExecution(
         blockchain,

src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala

@@ -1,16 +1,12 @@
 package io.iohk.ethereum.txExecTest
 
-import java.util.concurrent.Executors
-import io.iohk.ethereum.domain.{Address, BlockchainImpl, Receipt, UInt256}
+import io.iohk.ethereum.domain.{Address, Receipt, UInt256}
 import io.iohk.ethereum.ledger.{BlockExecution, BlockQueue, BlockValidation}
 import io.iohk.ethereum.txExecTest.util.FixtureProvider
 import io.iohk.ethereum.utils.{BlockchainConfig, ForkBlockNumbers, MonetaryPolicyConfig}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
-import scala.concurrent.ExecutionContext
-
-// scalastyle:off magic.number
 class ForksTest extends AnyFlatSpec with Matchers {
 
   trait TestSetup extends ScenarioSetup {
@@ -52,9 +48,7 @@ class ForksTest extends AnyFlatSpec with Matchers {
       ethCompatibleStorage = true,
       treasuryAddress = Address(0)
     )
-
     val noErrors = a[Right[_, Seq[Receipt]]]
-    val ec = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(4))
   }
 
   "Ledger" should "execute blocks with respect to forks" in new TestSetup {
@@ -63,11 +57,9 @@ class ForksTest extends AnyFlatSpec with Matchers {
     val startBlock = 1
     val endBlock = 11
 
-    protected val testBlockchainStorages = FixtureProvider.prepareStorages(startBlock, fixtures)
+    protected val testBlockchainStorages = FixtureProvider.prepareStorages(endBlock, fixtures)
 
     (startBlock to endBlock) foreach { blockToExecute =>
-      val storages = FixtureProvider.prepareStorages(blockToExecute - 1, fixtures)
-      val blockchain = BlockchainImpl(storages)
       val blockValidation = new BlockValidation(consensus, blockchain, BlockQueue(blockchain, syncConfig))
       val blockExecution = new BlockExecution(
         blockchain,

src/it/scala/io/iohk/ethereum/txExecTest/ScenarioSetup.scala

@@ -1,12 +1,11 @@
 package io.iohk.ethereum.txExecTest
 
-import io.iohk.ethereum.blockchain.sync
+import io.iohk.ethereum.blockchain.sync.EphemBlockchainTestSetup
 import io.iohk.ethereum.domain.{BlockchainImpl, BlockchainStorages}
 import io.iohk.ethereum.ledger.Ledger.VMImpl
 
-trait ScenarioSetup extends sync.ScenarioSetup {
+trait ScenarioSetup extends EphemBlockchainTestSetup {
   protected val testBlockchainStorages: BlockchainStorages
-
   override lazy val blockchain: BlockchainImpl = BlockchainImpl(testBlockchainStorages)
   override lazy val vm: VMImpl = new VMImpl
 }

src/it/scala/io/iohk/ethereum/txExecTest/util/FixtureProvider.scala

@@ -205,6 +205,8 @@ object FixtureProvider {
     )
   }
 
-  private def withClose[A, B <: Closeable](closeable: B)(f: B => A): A = try { f(closeable) }
-  finally { closeable.close() }
+  private def withClose[A, B <: Closeable](closeable: B)(f: B => A): A = {
+    try { f(closeable) }
+    finally { closeable.close() }
+  }
 }

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

@@ -8,7 +8,6 @@ import akka.testkit.TestActor.AutoPilot
 import akka.testkit.{TestKit, TestProbe}
 import akka.util.ByteString
 import io.iohk.ethereum.blockchain.sync.StateSyncUtils.{MptNodeData, TrieProvider}
-import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor._
 import io.iohk.ethereum.blockchain.sync.fast.{SyncStateScheduler, SyncStateSchedulerActor}
 import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor.{
   RestartRequested,
@@ -17,7 +16,6 @@ import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor.{
   StateSyncStats,
   WaitingForNewTargetBlock
 }
-import io.iohk.ethereum.db.dataSource.RocksDbDataSource.IterationError
 import io.iohk.ethereum.domain.{Address, BlockchainImpl, ChainWeight}
 import io.iohk.ethereum.network.EtcPeerManagerActor._
 import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.MessageFromPeer
@@ -28,7 +26,6 @@ import io.iohk.ethereum.network.{Peer, PeerId}
 import io.iohk.ethereum.utils.Config
 import io.iohk.ethereum.{Fixtures, ObjectGenerators, WithActorSystemShutDown}
 import monix.execution.Scheduler
-import monix.reactive.Observable
 import org.scalactic.anyvals.PosInt
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpecLike
@@ -154,7 +151,7 @@ class StateSyncSpec
       bestBlockHash = peerStatus.bestHash
     )
 
-    val trieProvider = new TrieProvider(blockchain, storagesInstance.storages.evmCodeStorage, blockchainConfig)
+    val trieProvider = new TrieProvider(blockchain, getNewStorages.storages.evmCodeStorage, blockchainConfig)
 
     val peersMap = (1 to 8).map { i =>
       (

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

@@ -33,7 +33,7 @@ object StateSyncUtils extends EphemBlockchainTestSetup {
 
     def buildWorld(accountData: Seq[MptNodeData], existingTree: Option[ByteString] = None): ByteString = {
       val init = InMemoryWorldStateProxy(
-        storagesInstance.storages.evmCodeStorage,
+        evmCodeStorage,
         blockchain.getBackingStorage(1),
         blockchain,
         blockchainConfig.accountStartNonce,

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

@@ -129,7 +129,7 @@ class PoWConsensusSpec
     powConsensus.minerCoordinatorRef.isDefined shouldBe true
   }
 
-  trait TestSetup extends ScenarioSetup with MockFactory {
+  trait TestSetup extends EphemBlockchainTestSetup with MockFactory {
     override lazy val blockchain: BlockchainImpl = mock[BlockchainImpl]
     val evmCodeStorage: EvmCodeStorage = mock[EvmCodeStorage]
     val validator: ValidatorsExecutor = successValidators.asInstanceOf[ValidatorsExecutor]

src/test/scala/io/iohk/ethereum/consensus/pow/PoWConsensusSpec.scala

@@ -11,34 +11,35 @@ import org.scalatest.wordspec.AnyWordSpec
 import io.iohk.ethereum.utils.ByteStringUtils._
 
 class BlockValidationSpec extends AnyWordSpec with Matchers with MockFactory {
+  import BlockValidationTestSetup._
 
   "BlockValidation" should {
     "validate block after execution" when {
-      "report valid results from execution as correct" in new BlockValidationTestSetup {
+      "report valid results from execution as correct" in {
         blockValidation.validateBlockAfterExecution(block, stateRootHash, receipts, gasUsed) shouldBe Right(
           BlockExecutionSuccess
         )
       }
 
-      "report as invalid a block that doesn't have the correct gas used" in new BlockValidationTestSetup {
+      "report as invalid a block that doesn't have the correct gas used" in {
         val invalidGasUsed: BigInt = gasUsed + 1
         blockValidation.validateBlockAfterExecution(block, stateRootHash, receipts, invalidGasUsed).isLeft shouldBe true
       }
 
-      "report as invalid a block that doesn't have the correct state root hash" in new BlockValidationTestSetup {
+      "report as invalid a block that doesn't have the correct state root hash" in {
         val invalidStateRootHash: ByteString = concatByteStrings((stateRootHash.head + 1).toByte, stateRootHash.tail)
         blockValidation.validateBlockAfterExecution(block, invalidStateRootHash, receipts, gasUsed).isLeft shouldBe true
       }
 
-      "report as invalid a block that doesn't have the correct receipts information" in new BlockValidationTestSetup {
+      "report as invalid a block that doesn't have the correct receipts information" in {
         val invalidReceipts: Seq[Receipt] = Seq.empty[Receipt]
         blockValidation.validateBlockAfterExecution(block, stateRootHash, invalidReceipts, gasUsed).isLeft shouldBe true
       }
     }
   }
 
   // scalastyle:off magic.number
-  trait BlockValidationTestSetup {
+  object BlockValidationTestSetup {
     private val setup = new io.iohk.ethereum.blockchain.sync.ScenarioSetup {
       override lazy val blockchain: BlockchainImpl = mock[BlockchainImpl]
 

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

@@ -268,7 +268,7 @@ trait TestSetupWithVmAndValidators extends EphemBlockchainTestSetup {
 
   implicit val schedulerContext: Scheduler = Scheduler.fixedPool("ledger-test-pool", 4)
 
-  class FailingTestLedgerImpl(validators: Validators)(implicit testContext: Scheduler)
+  class TestLedgerImplNotMockedBlockExecution(validators: Validators)(implicit testContext: Scheduler)
       extends LedgerImpl(
         blockchain,
         storagesInstance.storages.evmCodeStorage,
@@ -314,7 +314,7 @@ trait TestSetupWithVmAndValidators extends EphemBlockchainTestSetup {
   }
 
   override lazy val ledger = new TestLedgerImpl(successValidators)
-  lazy val failingLedger = new FailingTestLedgerImpl(successValidators)
+  lazy val failingLedger = new TestLedgerImplNotMockedBlockExecution(successValidators)
 
   def randomHash(): ByteString =
     ObjectGenerators.byteStringOfLengthNGen(32).sample.get