Merge remote-tracking branch 'origin/develop' into fix/fix-retry-config-option

Author: KonradStaniec

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

@@ -5,15 +5,14 @@ import io.iohk.ethereum.consensus.validators.BlockHeaderError.HeaderParentNotFou
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.ledger.BlockExecutionError.ValidationBeforeExecError
 import io.iohk.ethereum.ledger.BlockQueue.Leaf
-import io.iohk.ethereum.utils.{BlockchainConfig, ByteStringUtils, Logger}
+import io.iohk.ethereum.utils.{ByteStringUtils, Logger}
 import org.bouncycastle.util.encoders.Hex
 
 import scala.concurrent.{ExecutionContext, Future}
 
 class BlockImport(
     blockchain: BlockchainImpl,
     blockQueue: BlockQueue,
-    blockchainConfig: BlockchainConfig,
     blockValidation: BlockValidation,
     blockExecution: BlockExecution,
     validationContext: ExecutionContext // Can't be implicit because of importToTop method and ambiguous of executionContext
@@ -34,7 +33,10 @@ class BlockImport(
     } yield {
       validationResult.fold(
         error => handleImportTopValidationError(error, block, importResult),
-        _ => importResult
+        _ => {
+          measureBlockMetrics(importResult)
+          importResult
+        }
       )
     }
   }
@@ -72,17 +74,21 @@ class BlockImport(
           }
         )
 
-        if (importedBlocks.nonEmpty) {
-          importedBlocks.foreach(blockData => BlockMetrics.measure(blockData.block, blockchain.getBlockByHash))
-        }
-
         result
 
       case None =>
         BlockImportFailed(s"Newly enqueued block with hash: ${block.header.hash} is not part of a known branch")
     }
   }
 
+  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

@@ -100,7 +100,6 @@ class LedgerImpl(
     new BlockImport(
       blockchain,
       blockQueue,
-      blockchainConfig,
       blockValidation,
       blockExecution,
       validationContext