Skip to content

Commit a09af17

Browse files
committed
[Chore] Update Scalamock
1 parent f23c6bc commit a09af17

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ object Dependencies {
5252

5353
val testing: Seq[ModuleID] = Seq(
5454
"org.scalatest" %% "scalatest" % "3.2.2" % "it,test",
55-
"org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test",
55+
"org.scalamock" %% "scalamock" % "5.0.0" % "test",
5656
"org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
5757
"org.scalacheck" %% "scalacheck" % "1.14.1" % "it,test"
5858
)

src/test/scala/io/iohk/ethereum/jsonrpc/PersonalServiceSpec.scala

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.iohk.ethereum.jsonrpc
22

33
import java.time.Duration
4+
45
import akka.actor.ActorSystem
56
import akka.testkit.TestProbe
67
import akka.util.ByteString
@@ -15,15 +16,17 @@ import io.iohk.ethereum.keystore.{KeyStore, Wallet}
1516
import io.iohk.ethereum.transactions.PendingTransactionsManager._
1617
import io.iohk.ethereum.utils.{BlockchainConfig, MonetaryPolicyConfig, TxPoolConfig}
1718
import io.iohk.ethereum.{Fixtures, NormalPatience, Timeouts}
18-
import org.scalamock.matchers.Matcher
19+
import org.bouncycastle.util.encoders.Hex
20+
import org.scalamock.matchers.MatcherBase
1921
import org.scalamock.scalatest.MockFactory
2022
import org.scalatest.concurrent.{Eventually, ScalaFutures}
23+
import org.scalatest.flatspec.AnyFlatSpec
24+
import org.scalatest.matchers.should.Matchers
2125
import org.scalatest.time.{Millis, Seconds, Span}
22-
import org.bouncycastle.util.encoders.Hex
2326
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
27+
2428
import scala.concurrent.duration.FiniteDuration
25-
import org.scalatest.flatspec.AnyFlatSpec
26-
import org.scalatest.matchers.should.Matchers
29+
import scala.reflect.ClassTag
2730

2831
class PersonalServiceSpec
2932
extends AnyFlatSpec
@@ -437,10 +440,9 @@ class PersonalServiceSpec
437440
val nonce = 7
438441
val txValue = 128000
439442

440-
val blockchainConfig = BlockchainConfig (
443+
val blockchainConfig = BlockchainConfig(
441444
eip155BlockNumber = 12345,
442445
chainId = 0x03.toByte,
443-
444446
//unused
445447
networkId = 1,
446448
maxCodeSize = None,
@@ -495,7 +497,7 @@ class PersonalServiceSpec
495497
val personal =
496498
new PersonalService(keyStore, blockchain, txPool.ref, appStateStorage, blockchainConfig, txPoolConfig)
497499

498-
def array[T](arr: Array[T]): Matcher[Array[T]] =
500+
def array[T](arr: Array[T])(implicit ev: ClassTag[Array[T]]): MatcherBase =
499501
argThat((_: Array[T]) sameElements arr)
500502
}
501503
}

0 commit comments

Comments
 (0)