[ECIM-354] Apply review suggestions

input-output-hk · Jun 22, 2021 · 8b6bc37 · 8b6bc37
1 parent 6b2d9d9
commit 8b6bc37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/main/scala/io/iohk/ethereum/forkid/ForkId.scala b/src/main/scala/io/iohk/ethereum/forkid/ForkId.scala
@@ -38,16 +38,7 @@ object ForkId {
       else None
     }
 
-    (maybeDaoBlock.toList ++
-      config.forkBlockNumbers.productIterator.toList.flatMap {
-        case i: BigInt => Some(i)
-        case i: Option[_] =>
-          i.flatMap {
-            case n if n.isInstanceOf[BigInt] => Some(n.asInstanceOf[BigInt])
-            case n => None
-          }
-        case default => None
-      })
+    (maybeDaoBlock.toList ++ config.forkBlockNumbers.all)
       .filterNot(v => v == 0 || v == noFork)
       .distinct
       .sorted

diff --git a/src/main/scala/io/iohk/ethereum/utils/BlockchainConfig.scala b/src/main/scala/io/iohk/ethereum/utils/BlockchainConfig.scala
@@ -57,7 +57,17 @@ case class ForkBlockNumbers(
     ecip1097BlockNumber: BigInt,
     ecip1049BlockNumber: Option[BigInt],
     ecip1099BlockNumber: BigInt
-)
+) {
+  def all: List[BigInt] = this.productIterator.toList.flatMap {
+    case i: BigInt => Some(i)
+    case i: Option[_] =>
+      i.flatMap {
+        case n if n.isInstanceOf[BigInt] => Some(n.asInstanceOf[BigInt])
+        case n => None
+      }
+    case default => None
+  }
+}
 
 object BlockchainConfig {