Skip to content

Commit 323cc02

Browse files
kapkekapke
committed
[Chore] Update ScalaTest
1 parent 1668edf commit 323cc02

File tree

153 files changed

+977
-598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+977
-598
lines changed

‎project/Dependencies.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ object Dependencies {
5151
)
5252

5353
val testing: Seq[ModuleID] = Seq(
54-
"org.scalatest" %% "scalatest" % "3.0.8" % "it,test",
54+
"org.scalatest" %% "scalatest" % "3.2.2" % "it,test",
5555
"org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test",
56+
"org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
5657
"org.scalacheck" %% "scalacheck" % "1.14.1" % "it,test"
5758
)
5859

‎repo.nix

Lines changed: 88 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,6 +2324,22 @@
23242324
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.1/scala-reflect-2.12.1.pom";
23252325
sha256 = "808B17C95D7E260A375615992CD1FCE7D759B6FDEF5E64D7B70E3942AE014261";
23262326
};
2327+
"nix-public/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10-javadoc.jar" = {
2328+
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10-javadoc.jar";
2329+
sha256 = "A3D140669ABD6D20ED57FDFAF6D62029A00A3705FF0617EEFA085158C14FEA65";
2330+
};
2331+
"nix-public/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10-sources.jar" = {
2332+
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10-sources.jar";
2333+
sha256 = "C3A883670038F8030C41E5E3840D592E2C8BD89BF33D7D42A15C60F1207B9A32";
2334+
};
2335+
"nix-public/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10.jar" = {
2336+
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10.jar";
2337+
sha256 = "56B609E1BAB9144FB51525BFA01CCD72028154FC40A58685A1E9ADCBE7835730";
2338+
};
2339+
"nix-public/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10.pom" = {
2340+
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.10/scala-reflect-2.12.10.pom";
2341+
sha256 = "E8C5D5D2A7E3E2A62AB8650577A0AEBFD5B57CF3EA9601D928422DC29FBB2C73";
2342+
};
23272343
"nix-public/org/scala-lang/scala-reflect/2.12.11/scala-reflect-2.12.11-javadoc.jar" = {
23282344
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.11/scala-reflect-2.12.11-javadoc.jar";
23292345
sha256 = "A8E418EA1952DABBD5254B603D5AFBED483D1008F257052F1F365D1B4BE6D7D9";
@@ -2372,22 +2388,6 @@
23722388
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.4/scala-reflect-2.12.4.pom";
23732389
sha256 = "9BB07CA874C7EC1A945E32A02D4308BD3D655A3ABD7A23CEB1F109C795339CE0";
23742390
};
2375-
"nix-public/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8-javadoc.jar" = {
2376-
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8-javadoc.jar";
2377-
sha256 = "F7D299D01D190E239144A4C74D4EB33FA92C057B1D8F161FB7D75FD07E6426C4";
2378-
};
2379-
"nix-public/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8-sources.jar" = {
2380-
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8-sources.jar";
2381-
sha256 = "5C676791217D9B48560496556B8965CCEABCBFDBB65BBEBDC52E99C0A3847735";
2382-
};
2383-
"nix-public/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8.jar" = {
2384-
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8.jar";
2385-
sha256 = "4D6405395C4599CE04CEA08BA082339E3E42135DE9AAE2923C9F5367E957315A";
2386-
};
2387-
"nix-public/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8.pom" = {
2388-
url = "https://repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.8/scala-reflect-2.12.8.pom";
2389-
sha256 = "CBFFFF8D495FFD66C1234469A2965F54A82FA58E6816EE0E5803E896CAC167C3";
2390-
};
23912391
"nix-public/org/scala-sbt/compiler-bridge_2.12/1.2.5/compiler-bridge_2.12-1.2.5-javadoc.jar" = {
23922392
url = "https://repo1.maven.org/maven2/org/scala-sbt/compiler-bridge_2.12/1.2.5/compiler-bridge_2.12-1.2.5-javadoc.jar";
23932393
sha256 = "58CAA3EAE25920DFBA5FACBC0C449CBA01994982E96C992D080E0EE52F886AE2";
@@ -2484,6 +2484,22 @@
24842484
url = "https://repo1.maven.org/maven2/org/scalacheck/scalacheck_2.12/1.14.1/scalacheck_2.12-1.14.1.pom";
24852485
sha256 = "598156A43EADAB7EED9726996AC3D8EEBAC0A2A0B809E73FCD7C7054A0A0D03E";
24862486
};
2487+
"nix-public/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2-javadoc.jar" = {
2488+
url = "https://repo1.maven.org/maven2/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2-javadoc.jar";
2489+
sha256 = "6705E96A8345B226291B3EF508E35B4ABDC12AC5A9AE138F1EB5887DB1218CE6";
2490+
};
2491+
"nix-public/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2-sources.jar" = {
2492+
url = "https://repo1.maven.org/maven2/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2-sources.jar";
2493+
sha256 = "227E9ABD2F2A7D8507912A3F1C7E440B21F6B6321C068EE6CF8377AA55372624";
2494+
};
2495+
"nix-public/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2.jar" = {
2496+
url = "https://repo1.maven.org/maven2/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2.jar";
2497+
sha256 = "2D42A2D76A2B2FA9F4669D5353174ED5777586696E45A71E3EFA65FDE8FB0B2D";
2498+
};
2499+
"nix-public/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2.pom" = {
2500+
url = "https://repo1.maven.org/maven2/org/scalacheck/scalacheck_2.12/1.14.2/scalacheck_2.12-1.14.2.pom";
2501+
sha256 = "9C37891D16E50CFBD75FC9139BF69BACEA26BA43872B45BEA7B15D890C6E4779";
2502+
};
24872503
"nix-public/org/scalacheck/scalacheck_2.12/1.14.3/scalacheck_2.12-1.14.3-javadoc.jar" = {
24882504
url = "https://repo1.maven.org/maven2/org/scalacheck/scalacheck_2.12/1.14.3/scalacheck_2.12-1.14.3-javadoc.jar";
24892505
sha256 = "3B80446614D9FDDF4B5B3B8CF045BAFB966B0EE2F428E5C9C2FFFCF286C4CC1A";
@@ -2516,21 +2532,21 @@
25162532
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.0.1/scalactic_2.12-3.0.1.pom";
25172533
sha256 = "4292DA45C391265B88D22F03C918A367505A728811B99834040C0D238BD4EB46";
25182534
};
2519-
"nix-public/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8-javadoc.jar" = {
2520-
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8-javadoc.jar";
2521-
sha256 = "466086478EAC1F552992C0F18AAFAD5179D5FB4A56ECBB429B5E60C8C28401C9";
2535+
"nix-public/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0-javadoc.jar" = {
2536+
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0-javadoc.jar";
2537+
sha256 = "F42FC78735DDED8366AA0B54E29DB7B075676AE9AD4DAF8CC2464E5DAA1240EC";
25222538
};
2523-
"nix-public/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8-sources.jar" = {
2524-
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8-sources.jar";
2525-
sha256 = "B591D7EEA2955EF9B78FE60E7EBD109AA239AE67103396A9449DFB549DABA74A";
2539+
"nix-public/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0-sources.jar" = {
2540+
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0-sources.jar";
2541+
sha256 = "509FAE80B4291B24A5BBA52CEBF40338ED35866819DEFC0F0A5294BBC6AF764F";
25262542
};
2527-
"nix-public/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8.jar" = {
2528-
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8.jar";
2529-
sha256 = "5F9AD122F54E9A0112FF4FCAADFB2802D8796F5DDE021CAA4C831067FCA68469";
2543+
"nix-public/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0.jar" = {
2544+
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0.jar";
2545+
sha256 = "64AE1C206F5F7025648199CA242D661FBBFB9005F47B0382B2C5371EA357A32A";
25302546
};
2531-
"nix-public/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8.pom" = {
2532-
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.0.8/scalactic_2.12-3.0.8.pom";
2533-
sha256 = "C20AE1BEECB418B5F411E9D1357FC0E97A789BB9444521D30F8E2C334D47A45D";
2547+
"nix-public/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0.pom" = {
2548+
url = "https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.1.0/scalactic_2.12-3.1.0.pom";
2549+
sha256 = "4D99ED193D1053C19990C7E6DA4429FF473DD7FC3AD25D732783A22E0ED6294A";
25342550
};
25352551
"nix-public/org/scalamock/scalamock-core_2.12/3.6.0/scalamock-core_2.12-3.6.0-javadoc.jar" = {
25362552
url = "https://repo1.maven.org/maven2/org/scalamock/scalamock-core_2.12/3.6.0/scalamock-core_2.12-3.6.0-javadoc.jar";
@@ -2564,6 +2580,22 @@
25642580
url = "https://repo1.maven.org/maven2/org/scalamock/scalamock-scalatest-support_2.12/3.6.0/scalamock-scalatest-support_2.12-3.6.0.pom";
25652581
sha256 = "F0093E8844AA93A86846FE2F998C8EF3D499D97521CDC9B9E977BF2E80FDE0F7";
25662582
};
2583+
"nix-public/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0-javadoc.jar" = {
2584+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0-javadoc.jar";
2585+
sha256 = "CC3D834D69AD8C2F1925255FBE024162F2E4832307EABB2EB08799CF3E6BE086";
2586+
};
2587+
"nix-public/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0-sources.jar" = {
2588+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0-sources.jar";
2589+
sha256 = "B31D1757D085BA2F48082E7B0072E3BE0616BE6D5796D91D312FC31FF4CAB6CD";
2590+
};
2591+
"nix-public/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0.jar" = {
2592+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0.jar";
2593+
sha256 = "091453296D1D759E2EE4252C3FA631BE2CBB94B2A4D5172BB9E535BA19EBC5B3";
2594+
};
2595+
"nix-public/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0.pom" = {
2596+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest-compatible/3.1.0/scalatest-compatible-3.1.0.pom";
2597+
sha256 = "12E9F6BA82A078BF50CDF77D202C0FB6F8C569E95DD4ACC82C342F19CCF52D9C";
2598+
};
25672599
"nix-public/org/scalatest/scalatest_2.12/3.0.1/scalatest_2.12-3.0.1-javadoc.jar" = {
25682600
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.1/scalatest_2.12-3.0.1-javadoc.jar";
25692601
sha256 = "010A9626869A5F4D745A16E15C3CB99E0E4FCC515561C2E46515CA00DBA17BE2";
@@ -2580,21 +2612,37 @@
25802612
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.1/scalatest_2.12-3.0.1.pom";
25812613
sha256 = "073D2541ED6E8AE21FDE66A86AE1A1C18C8E802129199E050F4032A9D6F9AC6B";
25822614
};
2583-
"nix-public/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8-javadoc.jar" = {
2584-
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8-javadoc.jar";
2585-
sha256 = "B5D0C220375CA607F9E99AE4A0D48AE46BADF9F86CCCC7E96432C5615BA1B150";
2615+
"nix-public/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0-javadoc.jar" = {
2616+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0-javadoc.jar";
2617+
sha256 = "5E459BA85A0A3F4A6DCA349E7B9D5F4BA2C68E3DFB8CA92AC25C3011178033FA";
2618+
};
2619+
"nix-public/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0-sources.jar" = {
2620+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0-sources.jar";
2621+
sha256 = "4FB98D984839097AE6D55F6ACCCE1D7E2F6D3A0A3B5C2E1592E2411656E876AE";
2622+
};
2623+
"nix-public/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0.jar" = {
2624+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0.jar";
2625+
sha256 = "9A0C957F0E5D006C1DE8597514A0B3F1629CAE3C8F45A1439C306BE0E4180136";
2626+
};
2627+
"nix-public/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0.pom" = {
2628+
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.1.0/scalatest_2.12-3.1.0.pom";
2629+
sha256 = "48A21FA28053D0AB8EBE4241461D2CB83A5E57E355F52ECFD79D0ADAFA58C185";
2630+
};
2631+
"nix-public/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0-javadoc.jar" = {
2632+
url = "https://repo1.maven.org/maven2/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0-javadoc.jar";
2633+
sha256 = "86F5693F0147617E904C897ABE059084311AE56DCBC77D640FC8B11DC9712155";
25862634
};
2587-
"nix-public/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8-sources.jar" = {
2588-
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8-sources.jar";
2589-
sha256 = "F23DA5F345251F6B8BEE14A458ECBD92F04D7AA034DA2909C3B1E8EDDE70D7BF";
2635+
"nix-public/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0-sources.jar" = {
2636+
url = "https://repo1.maven.org/maven2/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0-sources.jar";
2637+
sha256 = "7E569919D8C9DB84DD2780A5C588C3853468ABEE14866C9ED75F91DBCD50718E";
25902638
};
2591-
"nix-public/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8.jar" = {
2592-
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8.jar";
2593-
sha256 = "A4045CEA66F3EAAB525696F3000D7D610593778BD070E98349A7066F872844CD";
2639+
"nix-public/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0.jar" = {
2640+
url = "https://repo1.maven.org/maven2/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0.jar";
2641+
sha256 = "DB9F0E7721DCAE538A38813BE0FC70F48DC8098CE407F6C2C025FFD546F30B18";
25942642
};
2595-
"nix-public/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8.pom" = {
2596-
url = "https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.8/scalatest_2.12-3.0.8.pom";
2597-
sha256 = "2FBACCB456C601F7BFBF268D88FDDC25BA797B42FA0ACB8AA0570922177D66CA";
2643+
"nix-public/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0.pom" = {
2644+
url = "https://repo1.maven.org/maven2/org/scalatestplus/scalacheck-1-14_2.12/3.1.0.0/scalacheck-1-14_2.12-3.1.0.0.pom";
2645+
sha256 = "8AB124CF6D74E9D93486483B6D6A093A754D95883325346C1C924809A6129653";
25982646
};
25992647
"nix-public/org/slf4j/slf4j-api/1.7.22/slf4j-api-1.7.22-javadoc.jar" = {
26002648
url = "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.22/slf4j-api-1.7.22-javadoc.jar";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import io.iohk.ethereum.mpt.MerklePatriciaTrie.defaultByteArraySerializable
66
import io.iohk.ethereum.utils.Logger
77
import io.iohk.ethereum.{ObjectGenerators, crypto}
88
import org.bouncycastle.util.encoders.Hex
9-
import org.scalatest.FunSuite
9+
import org.scalatest.funsuite.AnyFunSuite
1010
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
1111

1212
class MerklePatriciaTreeSpeedSpec
13-
extends FunSuite
13+
extends AnyFunSuite
1414
with ScalaCheckPropertyChecks
1515
with ObjectGenerators
1616
with Logger

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import io.iohk.ethereum.domain._
77
import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
88
import io.iohk.ethereum.utils.Logger
99
import org.scalacheck.Gen
10-
import org.scalatest.FunSuite
1110
import org.bouncycastle.util.encoders.Hex
11+
import org.scalatest.funsuite.AnyFunSuite
1212
import org.scalatestplus.scalacheck.{ScalaCheckDrivenPropertyChecks, ScalaCheckPropertyChecks}
1313

1414
/**
@@ -17,7 +17,7 @@ import org.scalatestplus.scalacheck.{ScalaCheckDrivenPropertyChecks, ScalaCheckP
1717
* - https://github.com/ethereum/pyrlp/blob/develop/tests/speed.py
1818
*/
1919
class RLPSpeedSuite
20-
extends FunSuite
20+
extends AnyFunSuite
2121
with ScalaCheckPropertyChecks
2222
with ScalaCheckDrivenPropertyChecks
2323
with ObjectGenerators

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package io.iohk.ethereum.ets.blockchain
22

33
import java.util.concurrent.Executors
4+
45
import akka.actor.ActorSystem
56
import io.iohk.ethereum.domain.Block
67
import io.iohk.ethereum.ets.common.TestOptions
78
import io.iohk.ethereum.extvm.ExtVMInterface
89
import io.iohk.ethereum.ledger.Ledger.VMImpl
910
import io.iohk.ethereum.nodebuilder.VmSetup
1011
import io.iohk.ethereum.utils.{Config, Logger, VmConfig}
11-
import org.scalatest._
12+
import org.scalatest.{Args, BeforeAndAfterAll, Status}
13+
import org.scalatest.freespec.AnyFreeSpec
14+
import org.scalatest.matchers.should.Matchers
15+
1216
import scala.concurrent.duration.Duration
1317
import scala.concurrent.{Await, ExecutionContext, Future}
1418

@@ -18,7 +22,7 @@ object BlockchainSuite {
1822
lazy val extvm: VMImpl = VmSetup.vm(VmConfig(Config.config), Config.blockchains.blockchainConfig, testMode = true)
1923
}
2024

21-
class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with Logger {
25+
class BlockchainSuite extends AnyFreeSpec with Matchers with BeforeAndAfterAll with Logger {
2226
import BlockchainSuite.testContext
2327

2428
val unsupportedNetworks: Set[String] = Set(
@@ -60,7 +64,7 @@ class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with
6064
cancel(s"Unsupported network: ${scenario.network}")
6165
} else if (!supportedNetworks.contains(scenario.network)) {
6266
fail(s"Unknown network: ${scenario.network}")
63-
} else if (isCanceled(group.name, name)){
67+
} else if (isCanceled(group.name, name)) {
6468
cancel(s"Test: $name in group: ${group.name} not yet supported")
6569
} else {
6670
log.info(s"Running test: ${group.name}#$name")
@@ -82,7 +86,9 @@ class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with
8286
}
8387

8488
private def isCanceled(groupName: String, testName: String): Boolean =
85-
ignoredTests.get(groupName).isDefined && (ignoredTests(groupName).contains(testName) || ignoredTests(groupName).isEmpty)
89+
ignoredTests.get(groupName).isDefined && (ignoredTests(groupName).contains(testName) || ignoredTests(
90+
groupName
91+
).isEmpty)
8692

8793
private def runScenario(scenario: BlockchainScenario, setup: ScenarioSetup, name: String): Unit = {
8894

@@ -110,7 +116,9 @@ class BlockchainSuite extends FreeSpec with Matchers with BeforeAndAfterAll with
110116
val lastBlock = getBestBlock
111117

112118
val expectedWorldStateHash =
113-
scenario.postStateHash.orElse(finalWorld.map(_.stateRootHash)).getOrElse(throw new IllegalStateException("postState or PostStateHash not defined"))
119+
scenario.postStateHash
120+
.orElse(finalWorld.map(_.stateRootHash))
121+
.getOrElse(throw new IllegalStateException("postState or PostStateHash not defined"))
114122

115123
lastBlock shouldBe defined
116124

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package io.iohk.ethereum.ets.vm
22

33
import akka.util.ByteString
4+
import io.iohk.ethereum.crypto.kec256
45
import io.iohk.ethereum.domain.TxLogEntry
56
import io.iohk.ethereum.ets.common.TestOptions
67
import io.iohk.ethereum.network.p2p.messages.PV63.TxLogEntryImplicits._
78
import io.iohk.ethereum.rlp._
89
import io.iohk.ethereum.utils.Logger
910
import io.iohk.ethereum.vm.MockWorldState._
1011
import io.iohk.ethereum.vm._
11-
import io.iohk.ethereum.crypto.kec256
1212
import org.scalatest._
13+
import org.scalatest.freespec.AnyFreeSpec
14+
import org.scalatest.matchers.should.Matchers
1315

14-
class VMSuite extends FreeSpec with Matchers with Logger {
16+
class VMSuite extends AnyFreeSpec with Matchers with Logger {
1517

1618
val vm = new TestVM
1719

@@ -79,7 +81,9 @@ class VMSuite extends FreeSpec with Matchers with Logger {
7981
result.internalTxs.flatMap(internalTxToCallCreate) shouldEqual callcreates
8082
}
8183

82-
if (scenario.gas.isEmpty && scenario.out.isEmpty && scenario.callcreates.isEmpty && scenario.post.isEmpty && scenario.logs.isEmpty) {
84+
if (
85+
scenario.gas.isEmpty && scenario.out.isEmpty && scenario.callcreates.isEmpty && scenario.post.isEmpty && scenario.logs.isEmpty
86+
) {
8387
result.error.isDefined shouldBe true
8488
}
8589
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package io.iohk.ethereum.vm
22

33
import io.iohk.ethereum.vm.utils.EvmTestEnv
4-
import org.scalatest.{FreeSpec, Matchers}
4+
import org.scalatest.matchers.should.Matchers
5+
import org.scalatest.freespec.AnyFreeSpec
56

6-
class CallSelfDestructSpec extends FreeSpec with Matchers {
7+
class CallSelfDestructSpec extends AnyFreeSpec with Matchers {
78

89
"EVM running CallSelfDestruct contract" - {
910

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.iohk.ethereum.vm
22

33
import io.iohk.ethereum.vm.utils.EvmTestEnv
4-
import org.scalatest.{FreeSpec, Matchers}
4+
import org.scalatest.matchers.should.Matchers
5+
import org.scalatest.freespec.AnyFreeSpec
56
import io.iohk.ethereum.domain.UInt256
67

78
// scalastyle:off magic.number
8-
class CallerSpec extends FreeSpec with Matchers {
9+
class CallerSpec extends AnyFreeSpec with Matchers {
910

1011
"EVM running Caller contract" - {
1112

0 commit comments

Comments
 (0)