[ETCM-49] Fix block measuring

Author: mirkoAlic

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockImporter.scala

@@ -6,7 +6,6 @@ import cats.data.NonEmptyList
 import cats.instances.future._
 import cats.instances.list._
 import cats.syntax.apply._
-import io.iohk.ethereum.blockchain.sync.BlockMetrics
 import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcasterActor.BroadcastBlocks
 import io.iohk.ethereum.crypto.kec256
 import io.iohk.ethereum.domain.{Block, Blockchain, SignedTransaction}
@@ -126,10 +125,7 @@ class BlockImporter(
         }
 
         errorOpt match {
-          case None => {
-            importedBlocks.map(block => BlockMetrics.measure(block, blockchain.getBlockByHash))
-            Running
-          }
+          case None => Running
           case Some(err) =>
             log.error("Block import error {}", err)
             val notImportedBlocks = blocks.drop(importedBlocks.size)

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

@@ -66,6 +66,12 @@ class BlockImport(
           result.toString
         })
 
+        if (importedBlocks.nonEmpty) {
+          importedBlocks.map(
+            blockData => BlockMetrics.measure(blockData.block, blockchain.getBlockByHash)
+          )
+        }
+
         result
 
       case None =>

src/main/scala/io/iohk/ethereum/blockchain/sync/BlockMetrics.scala renamed to src/main/scala/io/iohk/ethereum/ledger/BlockMetrics.scala

@@ -1,4 +1,4 @@
-package io.iohk.ethereum.blockchain.sync
+package io.iohk.ethereum.ledger
 
 import akka.util.ByteString
 import com.google.common.util.concurrent.AtomicDouble

src/test/scala/io/iohk/ethereum/blockchain/sync/regular/RegularSyncSpec.scala

@@ -170,8 +170,6 @@ class RegularSyncSpec extends RegularSyncFixtures with WordSpecLike with BeforeA
         implicit val ec: ExecutionContext = system.dispatcher
         override lazy val blockchain: BlockchainImpl = stub[BlockchainImpl]
         (blockchain.getBestBlockNumber _).when().onCall(() => ledger.bestBlock.number)
-        // Just to bypass metrics needs
-        (blockchain.getBlockByHash _).when(*).returns(None)
         override lazy val ledger: TestLedgerImpl = new FakeLedgerImpl()
         override lazy val syncConfig = defaultSyncConfig.copy(
           blockHeadersPerRequest = 5,

src/test/scala/io/iohk/ethereum/ledger/BlockImportSpec.scala

@@ -49,6 +49,9 @@ class BlockImportSpec extends FlatSpec with Matchers with ScalaFutures {
     val emptyWorld: InMemoryWorldStateProxy = BlockchainImpl(storagesInstance.storages)
       .getWorldStateProxy(-1, UInt256.Zero, None, noEmptyAccounts = false, ethCompatibleStorage = true)
 
+    // Just to bypass metrics needs
+    (blockchain.getBlockByHash _).expects(*).returning(None)
+
     (blockQueue.enqueueBlock _).expects(block, bestNum).returning(Some(Leaf(hash, newTd)))
     (blockQueue.getBranch _).expects(hash, true).returning(List(block))