Merge pull request #835 from input-output-hk/fix/checkpointing-metrics

[FIX] Trigger block execution metrics on reorg as well

Author: pslaski

src/main/scala/io/iohk/ethereum/ledger/BlockImport.scala

@@ -33,10 +33,7 @@ class BlockImport(
     } yield {
       validationResult.fold(
         error => handleImportTopValidationError(error, block, importResult),
-        _ => {
-          measureBlockMetrics(importResult)
-          importResult
-        }
+        _ => importResult
       )
     }
   }
@@ -81,14 +78,6 @@ class BlockImport(
     }
   }
 
-  private def measureBlockMetrics(importResult: BlockImportResult): Unit = {
-    importResult match {
-      case BlockImportedToTop(blockImportData) =>
-        blockImportData.foreach(blockData => BlockMetrics.measure(blockData.block, blockchain.getBlockByHash))
-      case _ => ()
-    }
-  }
-
   private def handleImportTopValidationError(
       error: ValidationBeforeExecError,
       block: Block,

src/main/scala/io/iohk/ethereum/ledger/Ledger.scala

@@ -130,11 +130,13 @@ class LedgerImpl(
       val hash = currentBestBlock.header.hash
       blockchain.getChainWeightByHash(hash) match {
         case Some(weight) =>
-          if (isPossibleNewBestBlock(block.header, currentBestBlock.header)) {
+          val importResult = if (isPossibleNewBestBlock(block.header, currentBestBlock.header)) {
             blockImport.importToTop(block, currentBestBlock, weight)
           } else {
             blockImport.reorganise(block, currentBestBlock, weight)
           }
+          importResult.foreach(measureBlockMetrics)
+          importResult
 
         case None =>
           Future.successful(BlockImportFailed(s"Couldn't get total difficulty for current best block with hash: $hash"))
@@ -154,6 +156,16 @@ class LedgerImpl(
   override def resolveBranch(headers: NonEmptyList[BlockHeader]): BranchResolutionResult =
     branchResolution.resolveBranch(headers)
 
+  private def measureBlockMetrics(importResult: BlockImportResult): Unit = {
+    importResult match {
+      case BlockImportedToTop(blockImportData) =>
+        blockImportData.foreach(blockData => BlockMetrics.measure(blockData.block, blockchain.getBlockByHash))
+      case ChainReorganised(_, newBranch, _) =>
+        newBranch.foreach(block => BlockMetrics.measure(block, blockchain.getBlockByHash))
+      case _ => ()
+    }
+  }
+
 }
 
 object Ledger {