Update BlockFetcherState with suggestion from review

bsuieric · AnastasiiaL · bsuieric · commit 819821fe5d15 · 2021-03-01T11:47:38.000+01:00
Co-authored-by: Anastasiia Pushkina &lt;anastasiia.pushkina@iohk.io&gt;
diff --git a/src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherState.scala b/src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherState.scala
@@ -130,9 +130,10 @@ case class BlockFetcherState(
     }
 
   private def checkConsistencyWithReadyBlocks(headers: Seq[BlockHeader]): Boolean = {
-    if (waitingHeaders.isEmpty) {
-      (readyBlocks.lastOption.map(_.header), headers.headOption).mapN(_ isParentOf _).getOrElse(true)
-    } else true
+    (readyBlocks, headers) match {
+      case (_ :+ last, head +: _) if waitingHeaders.isEmpty => last.header isParentOf head
+      case _ => true
+    }
   }
 
   def validateNewBlockHashes(hashes: Seq[BlockHash]): Either[String, Seq[BlockHash]] =

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,10 @@ case class BlockFetcherState(`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private def checkConsistencyWithReadyBlocks(headers: Seq[BlockHeader]): Boolean = {`
`133`		`- if (waitingHeaders.isEmpty) {`
`134`		`- (readyBlocks.lastOption.map(_.header), headers.headOption).mapN(_ isParentOf _).getOrElse(true)`
`135`		`- } else true`
	`133`	`+ (readyBlocks, headers) match {`
	`134`	`+ case (_ :+ last, head +: _) if waitingHeaders.isEmpty => last.header isParentOf head`
	`135`	`+ case _ => true`
	`136`	`+ }`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`def validateNewBlockHashes(hashes: Seq[BlockHash]): Either[String, Seq[BlockHash]] =`