Updated caches to fit 2.13

input-output-hk · Jan 11, 2021 · 7f2b462 · 7f2b462
1 parent 0a32eda
commit 7f2b462
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/scala/io/iohk/ethereum/db/cache/LruCache.scala b/src/main/scala/io/iohk/ethereum/db/cache/LruCache.scala
@@ -6,7 +6,7 @@ import io.iohk.ethereum.utils.Config.NodeCacheConfig
 import com.google.common.cache
 import com.google.common.cache.{CacheBuilder, RemovalNotification}
 
-import scala.collection.JavaConverters.asScalaIterator
+import scala.jdk.CollectionConverters._
 import scala.concurrent.duration.FiniteDuration
 
 class LruCache[K <: AnyRef, V <: AnyRef](
@@ -27,11 +27,11 @@ class LruCache[K <: AnyRef, V <: AnyRef](
       )
       .build()
 
-  override def drain(): Seq[(K, V)] = {
+  override def drain: Seq[(K, V)] = {
     this.lastClear = System.nanoTime()
     val mapView = lruCache.asMap
     val iter = mapView.entrySet.iterator
-    val result = asScalaIterator(iter).map { e =>
+    val result = iter.asScala.map { e =>
       val key = e.getKey
       val value = mapView.remove(key)
       key -> value

diff --git a/src/main/scala/io/iohk/ethereum/db/cache/MapCache.scala b/src/main/scala/io/iohk/ethereum/db/cache/MapCache.scala
@@ -1,10 +1,7 @@
 package io.iohk.ethereum.db.cache
 
 import java.util.concurrent.TimeUnit
-
 import io.iohk.ethereum.utils.Config.NodeCacheConfig
-
-import scala.collection.Seq
 import scala.collection.concurrent.{TrieMap, Map => CMap}
 import scala.concurrent.duration.FiniteDuration