ETCM-1058 Fix code after rebase

Author: Leonor Boga

src/main/scala/io/iohk/ethereum/consensus/ConsensusImpl.scala

@@ -321,7 +321,7 @@ class ConsensusImpl(
   private def removeBlocksUntil(parent: ByteString, fromNumber: BigInt): List[BlockData] = {
     @tailrec
     def removeBlocksUntil(parent: ByteString, fromNumber: BigInt, acc: List[BlockData]): List[BlockData] =
-      blockchainReader.getBestBranch().getBlockByNumber(fromNumber) match {
+      blockchainReader.getBlockByNumber(blockchainReader.getBestBranch(), fromNumber) match {
         case Some(block) if block.header.hash == parent || fromNumber == 0 =>
           acc
 

src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala

@@ -264,7 +264,7 @@ class TestService(
       getBlockForMining(blockchainReader.getBestBlock().get)
         .flatMap(blockForMining =>
           testModeComponentsProvider
-            .evaluateBranchBlock(preimageCache)
+            .getConsensus(preimageCache)
             .evaluateBranchBlock(blockForMining.block)
         )
         .map { res =>
@@ -304,7 +304,7 @@ class TestService(
         Task.now(Left(JsonRpcError(-1, "block validation failed!", None)))
       case Success(value) =>
         testModeComponentsProvider
-          .evaluateBranchBlock(preimageCache)
+          .getConsensus(preimageCache)
           .evaluateBranchBlock(value)
           .flatMap(handleResult(value))
     }

src/main/scala/io/iohk/ethereum/testmode/TestModeComponentsProvider.scala

@@ -29,7 +29,7 @@ class TestModeComponentsProvider(
     node: TestNode
 ) {
 
-  def evaluateBranchBlock(
+  def getConsensus(
       preimageCache: collection.concurrent.Map[ByteString, UInt256]
   ): Consensus = {
     val consensuz = consensus()