[Chore] update scalatest (#689)

* [Chore] Update ScalaTest

* [Chore] Update Scalamock

* [Chore] Update repo.nix

project/Dependencies.scala

@@ -51,8 +51,9 @@ object Dependencies {
   )
 
   val testing: Seq[ModuleID] = Seq(
-    "org.scalatest" %% "scalatest" % "3.0.8" % "it,test",
-    "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test",
+    "org.scalatest" %% "scalatest" % "3.2.2" % "it,test",
+    "org.scalamock" %% "scalamock" % "5.0.0" % "test",
+    "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
     "org.scalacheck" %% "scalacheck" % "1.14.1" % "it,test"
   )
 

src/benchmark/scala/io/iohk/ethereum/mpt/MerklePatriciaTreeSpeedSpec.scala

@@ -6,11 +6,11 @@ import io.iohk.ethereum.mpt.MerklePatriciaTrie.defaultByteArraySerializable
 import io.iohk.ethereum.utils.Logger
 import io.iohk.ethereum.{ObjectGenerators, crypto}
 import org.bouncycastle.util.encoders.Hex
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
 class MerklePatriciaTreeSpeedSpec
-    extends FunSuite
+    extends AnyFunSuite
     with ScalaCheckPropertyChecks
     with ObjectGenerators
     with Logger

src/benchmark/scala/io/iohk/ethereum/rlp/RLPSpeedSuite.scala

@@ -7,8 +7,8 @@ import io.iohk.ethereum.domain._
 import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
 import io.iohk.ethereum.utils.Logger
 import org.scalacheck.Gen
-import org.scalatest.FunSuite
 import org.bouncycastle.util.encoders.Hex
+import org.scalatest.funsuite.AnyFunSuite
 import org.scalatestplus.scalacheck.{ScalaCheckDrivenPropertyChecks, ScalaCheckPropertyChecks}
 
 /**
@@ -17,7 +17,7 @@ import org.scalatestplus.scalacheck.{ScalaCheckDrivenPropertyChecks, ScalaCheckP
   *   - https://github.com/ethereum/pyrlp/blob/develop/tests/speed.py
   */
 class RLPSpeedSuite
-    extends FunSuite
+    extends AnyFunSuite
     with ScalaCheckPropertyChecks
     with ScalaCheckDrivenPropertyChecks
     with ObjectGenerators

src/ets/scala/io/iohk/ethereum/ets/blockchain/BlockchainSuite.scala

@@ -1,14 +1,18 @@
 package io.iohk.ethereum.ets.blockchain
 
 import java.util.concurrent.Executors
+
 import akka.actor.ActorSystem
 import io.iohk.ethereum.domain.Block
 import io.iohk.ethereum.ets.common.TestOptions
 import io.iohk.ethereum.extvm.ExtVMInterface
 import io.iohk.ethereum.ledger.Ledger.VMImpl
 import io.iohk.ethereum.nodebuilder.VmSetup
 import io.iohk.ethereum.utils.{Config, Logger, VmConfig}
-import org.scalatest._
+import org.scalatest.{Args, BeforeAndAfterAll, Status}
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
+
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, ExecutionContext, Future}
 
@@ -18,7 +22,7 @@ object BlockchainSuite {
   lazy val extvm: VMImpl = VmSetup.vm(VmConfig(Config.config), Config.blockchains.blockchainConfig, testMode = true)
 }
 
-class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with Logger {
+class BlockchainSuite extends AnyFreeSpec with Matchers with BeforeAndAfterAll with Logger {
   import BlockchainSuite.testContext
 
   val unsupportedNetworks: Set[String] = Set(
@@ -60,7 +64,7 @@ class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with
               cancel(s"Unsupported network: ${scenario.network}")
             } else if (!supportedNetworks.contains(scenario.network)) {
               fail(s"Unknown network: ${scenario.network}")
-            } else if (isCanceled(group.name, name)){
+            } else if (isCanceled(group.name, name)) {
               cancel(s"Test: $name in group: ${group.name} not yet supported")
             } else {
               log.info(s"Running test: ${group.name}#$name")
@@ -82,7 +86,9 @@ class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with
   }
 
   private def isCanceled(groupName: String, testName: String): Boolean =
-    ignoredTests.get(groupName).isDefined && (ignoredTests(groupName).contains(testName) || ignoredTests(groupName).isEmpty)
+    ignoredTests.get(groupName).isDefined && (ignoredTests(groupName).contains(testName) || ignoredTests(
+      groupName
+    ).isEmpty)
 
   private def runScenario(scenario: BlockchainScenario, setup: ScenarioSetup, name: String): Unit = {
 
@@ -110,7 +116,9 @@ class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with
     val lastBlock = getBestBlock
 
     val expectedWorldStateHash =
-      scenario.postStateHash.orElse(finalWorld.map(_.stateRootHash)).getOrElse(throw new IllegalStateException("postState or PostStateHash not defined"))
+      scenario.postStateHash
+        .orElse(finalWorld.map(_.stateRootHash))
+        .getOrElse(throw new IllegalStateException("postState or PostStateHash not defined"))
 
     lastBlock shouldBe defined
 

src/ets/scala/io/iohk/ethereum/ets/vm/VMSuite.scala

@@ -1,17 +1,19 @@
 package io.iohk.ethereum.ets.vm
 
 import akka.util.ByteString
+import io.iohk.ethereum.crypto.kec256
 import io.iohk.ethereum.domain.TxLogEntry
 import io.iohk.ethereum.ets.common.TestOptions
 import io.iohk.ethereum.network.p2p.messages.PV63.TxLogEntryImplicits._
 import io.iohk.ethereum.rlp._
 import io.iohk.ethereum.utils.Logger
 import io.iohk.ethereum.vm.MockWorldState._
 import io.iohk.ethereum.vm._
-import io.iohk.ethereum.crypto.kec256
 import org.scalatest._
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
-class VMSuite extends FreeSpec with Matchers with Logger {
+class VMSuite extends AnyFreeSpec with Matchers with Logger {
 
   val vm = new TestVM
 
@@ -79,7 +81,9 @@ class VMSuite extends FreeSpec with Matchers with Logger {
       result.internalTxs.flatMap(internalTxToCallCreate) shouldEqual callcreates
     }
 
-    if (scenario.gas.isEmpty && scenario.out.isEmpty && scenario.callcreates.isEmpty && scenario.post.isEmpty && scenario.logs.isEmpty) {
+    if (
+      scenario.gas.isEmpty && scenario.out.isEmpty && scenario.callcreates.isEmpty && scenario.post.isEmpty && scenario.logs.isEmpty
+    ) {
       result.error.isDefined shouldBe true
     }
   }

src/evmTest/scala/io/iohk/ethereum/vm/CallSelfDestructSpec.scala

@@ -1,9 +1,10 @@
 package io.iohk.ethereum.vm
 
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.freespec.AnyFreeSpec
 
-class CallSelfDestructSpec extends FreeSpec with Matchers {
+class CallSelfDestructSpec extends AnyFreeSpec with Matchers {
 
   "EVM running CallSelfDestruct contract" - {
 

src/evmTest/scala/io/iohk/ethereum/vm/CallerSpec.scala

@@ -1,11 +1,12 @@
 package io.iohk.ethereum.vm
 
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.freespec.AnyFreeSpec
 import io.iohk.ethereum.domain.UInt256
 
 // scalastyle:off magic.number
-class CallerSpec extends FreeSpec with Matchers {
+class CallerSpec extends AnyFreeSpec with Matchers {
 
   "EVM running Caller contract" - {
 

src/evmTest/scala/io/iohk/ethereum/vm/ContractCallingItselfSpec.scala

@@ -1,11 +1,12 @@
 package io.iohk.ethereum.vm
 
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.freespec.AnyFreeSpec
 import io.iohk.ethereum.domain.UInt256
 
 // scalastyle:off magic.number
-class ContractCallingItselfSpec extends FreeSpec with Matchers {
+class ContractCallingItselfSpec extends AnyFreeSpec with Matchers {
 
   "EVM running ContractCallingItself contract" - {
 

src/evmTest/scala/io/iohk/ethereum/vm/FibonacciSpec.scala

@@ -1,11 +1,12 @@
 package io.iohk.ethereum.vm
 
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.freespec.AnyFreeSpec
 import io.iohk.ethereum.domain.UInt256
 
 // scalastyle:off magic.number
-class FibonacciSpec extends FreeSpec with Matchers {
+class FibonacciSpec extends AnyFreeSpec with Matchers {
 
   "EVM running Fibonacci contract" - {
 

src/evmTest/scala/io/iohk/ethereum/vm/MinimumViableTokenSpec.scala

@@ -1,11 +1,12 @@
 package io.iohk.ethereum.vm
 
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FreeSpec, Matchers}
 import io.iohk.ethereum.domain.UInt256
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.freespec.AnyFreeSpec
 
 // scalastyle:off magic.number
-class MinimumViableTokenSpec extends FreeSpec with Matchers {
+class MinimumViableTokenSpec extends AnyFreeSpec with Matchers {
 
   "EVM running MinimumViableToken contract" - {
 
@@ -38,8 +39,8 @@ class MinimumViableTokenSpec extends FreeSpec with Matchers {
       val sender = createAccount(balance = 10)
       val receiver = createAccount(balance = 10)
 
-      val (result, _) = deployContract("MinimumViableToken", creatorAddress = sender,
-        constructorArgs = Seq(100), gasLimit = 102934)
+      val (result, _) =
+        deployContract("MinimumViableToken", creatorAddress = sender, constructorArgs = Seq(100), gasLimit = 102934)
 
       result.error shouldBe Some(OutOfGas)
     }

src/evmTest/scala/io/iohk/ethereum/vm/MutualRecursionSpec.scala

@@ -1,11 +1,12 @@
 package io.iohk.ethereum.vm
 
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FreeSpec, Matchers}
 import io.iohk.ethereum.domain.UInt256
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
 // scalastyle:off magic.number
-class MutualRecursionSpec extends FreeSpec with Matchers {
+class MutualRecursionSpec extends AnyFreeSpec with Matchers {
 
   "EVM running MutualRecursion contract" - {
 

src/evmTest/scala/io/iohk/ethereum/vm/PrecompiledContractsSpecEvm.scala

@@ -6,10 +6,11 @@ import io.iohk.ethereum.crypto._
 import io.iohk.ethereum.domain.SignedTransaction.{FirstByteOfAddress, LastByteOfAddress}
 import io.iohk.ethereum.nodebuilder.SecureRandomBuilder
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FunSuite, Matchers}
 import org.bouncycastle.crypto.params.ECPublicKeyParameters
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
 
-class PrecompiledContractsSpecEvm extends FunSuite with Matchers with SecureRandomBuilder {
+class PrecompiledContractsSpecEvm extends AnyFunSuite with Matchers with SecureRandomBuilder {
 
   test("Precompiled Contracts") {
     val keyPair = generateKeyPair(secureRandom)

src/evmTest/scala/io/iohk/ethereum/vm/ThrowSpec.scala

@@ -1,10 +1,11 @@
 package io.iohk.ethereum.vm
 
 import io.iohk.ethereum.vm.utils.EvmTestEnv
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
 // scalastyle:off magic.number
-class ThrowSpec extends FreeSpec with Matchers {
+class ThrowSpec extends AnyFreeSpec with Matchers {
 
   "EVM running Throw contract" - {
 

src/it/scala/io/iohk/ethereum/db/DataSourceIntegrationTestBehavior.scala

@@ -2,16 +2,17 @@ package io.iohk.ethereum.db
 
 import java.io.File
 import java.nio.file.Files
+
 import akka.util.ByteString
 import io.iohk.ethereum.ObjectGenerators
 import io.iohk.ethereum.db.dataSource.{DataSource, DataSourceUpdate}
 import io.iohk.ethereum.db.dataSource.DataSource.{Key, Namespace, Value}
-import org.scalatest.FlatSpec
+import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
 trait DataSourceIntegrationTestBehavior extends ScalaCheckPropertyChecks with ObjectGenerators {
 
-  this: FlatSpec =>
+  this: AnyFlatSpec =>
 
   val KeySizeWithoutPrefix: Int = 32
   val KeySize: Int = KeySizeWithoutPrefix + 1
@@ -32,15 +33,15 @@ trait DataSourceIntegrationTestBehavior extends ScalaCheckPropertyChecks with Ob
   }
 
   def prepareUpdate(
-    namespace: Namespace = OtherNamespace,
-    toRemove: Seq[Key] = Nil,
-    toUpsert: Seq[(Key, Value)] = Nil
+      namespace: Namespace = OtherNamespace,
+      toRemove: Seq[Key] = Nil,
+      toUpsert: Seq[(Key, Value)] = Nil
   ): Seq[DataSourceUpdate] =
     Seq(DataSourceUpdate(namespace, toRemove, toUpsert))
 
   def updateInSeparateCalls(
-    dataSource: DataSource,
-    toUpsert: Seq[(ByteString, ByteString)]
+      dataSource: DataSource,
+      toUpsert: Seq[(ByteString, ByteString)]
   ): Unit = {
     toUpsert.foreach { keyValuePair =>
       dataSource.update(prepareUpdate(toUpsert = Seq(keyValuePair)))
@@ -93,9 +94,8 @@ trait DataSourceIntegrationTestBehavior extends ScalaCheckPropertyChecks with Ob
           val keyListWithExtraByte = keyList.map(1.toByte +: _)
           updateInSeparateCalls(db, keyList.zip(keyListWithExtraByte))
 
-          keyList.zip(keyListWithExtraByte).foreach {
-            case (key, value) =>
-              assert(db.get(OtherNamespace, key).contains(value))
+          keyList.zip(keyListWithExtraByte).foreach { case (key, value) =>
+            assert(db.get(OtherNamespace, key).contains(value))
           }
 
           db.destroy()
@@ -113,9 +113,8 @@ trait DataSourceIntegrationTestBehavior extends ScalaCheckPropertyChecks with Ob
           val keyListWithExtraByte = keyList.map(1.toByte +: _)
           db.update(prepareUpdate(toUpsert = keyList.zip(keyListWithExtraByte)))
 
-          keyList.zip(keyListWithExtraByte).foreach {
-            case (key, value) =>
-              assert(db.get(OtherNamespace, key).contains(value))
+          keyList.zip(keyListWithExtraByte).foreach { case (key, value) =>
+            assert(db.get(OtherNamespace, key).contains(value))
           }
 
           db.destroy()
@@ -191,9 +190,8 @@ trait DataSourceIntegrationTestBehavior extends ScalaCheckPropertyChecks with Ob
           val valList2 = keyList.map(2.toByte +: _)
           db.update(prepareUpdate(namespace = OtherNamespace2, toUpsert = keyList.zip(valList2)))
 
-          keyList.zip(valList1).foreach {
-            case (key, value) =>
-              assert(db.get(OtherNamespace, key).contains(value))
+          keyList.zip(valList1).foreach { case (key, value) =>
+            assert(db.get(OtherNamespace, key).contains(value))
           }
           keyList.zip(valList2).foreach { case (key, value) =>
             assert(db.get(OtherNamespace2, key).contains(value))
@@ -223,9 +221,8 @@ trait DataSourceIntegrationTestBehavior extends ScalaCheckPropertyChecks with Ob
           keyList.foreach { key =>
             assert(db.get(OtherNamespace, key).isEmpty)
           }
-          keyList.zip(valList2).foreach {
-            case (key, value) =>
-              assert(db.get(OtherNamespace2, key).contains(value))
+          keyList.zip(valList2).foreach { case (key, value) =>
+            assert(db.get(OtherNamespace2, key).contains(value))
           }
 
           //Removal of keys from the OtherNamespace2 namespace

src/it/scala/io/iohk/ethereum/db/RocksDbDataSourceIntegrationSuite.scala

@@ -2,22 +2,24 @@ package io.iohk.ethereum.db
 
 import io.iohk.ethereum.db.dataSource.{RocksDbConfig, RocksDbDataSource}
 import io.iohk.ethereum.db.storage.Namespaces
-import org.scalatest.FlatSpec
+import org.scalatest.flatspec.AnyFlatSpec
 
-class RocksDbDataSourceIntegrationSuite extends FlatSpec with DataSourceIntegrationTestBehavior {
+class RocksDbDataSourceIntegrationSuite extends AnyFlatSpec with DataSourceIntegrationTestBehavior {
 
-  private def createDataSource(dataSourcePath: String) = RocksDbDataSource(new RocksDbConfig {
-    override val createIfMissing: Boolean = true
-    override val paranoidChecks: Boolean = true
-    override val path: String = dataSourcePath
-    override val maxThreads: Int = 1
-    override val maxOpenFiles: Int = 32
-    override val verifyChecksums: Boolean = true
-    override val levelCompaction: Boolean = true
-    override val blockSize: Long = 16384
-    override val blockCacheSize: Long = 33554432
-  }, Namespaces.nsSeq)
+  private def createDataSource(dataSourcePath: String) = RocksDbDataSource(
+    new RocksDbConfig {
+      override val createIfMissing: Boolean = true
+      override val paranoidChecks: Boolean = true
+      override val path: String = dataSourcePath
+      override val maxThreads: Int = 1
+      override val maxOpenFiles: Int = 32
+      override val verifyChecksums: Boolean = true
+      override val levelCompaction: Boolean = true
+      override val blockSize: Long = 16384
+      override val blockCacheSize: Long = 33554432
+    },
+    Namespaces.nsSeq
+  )
 
   it should behave like dataSource(createDataSource)
 }
-