[ETCM-1042] rename BestBranchSubset to BestBranch

Author: Aurélien Richez

src/main/scala/io/iohk/ethereum/domain/BlockchainReader.scala

@@ -8,7 +8,7 @@ import io.iohk.ethereum.db.storage.BlockHeadersStorage
 import io.iohk.ethereum.db.storage.BlockNumberMappingStorage
 import io.iohk.ethereum.db.storage.ReceiptStorage
 import io.iohk.ethereum.db.storage.StateStorage
-import io.iohk.ethereum.domain.branch.BestBranchSubset
+import io.iohk.ethereum.domain.branch.BestBranch
 import io.iohk.ethereum.domain.branch.Branch
 import io.iohk.ethereum.domain.branch.EmptyBranch
 import io.iohk.ethereum.mpt.MptNode
@@ -75,7 +75,7 @@ class BlockchainReader(
     val number = getBestBlockNumber()
     blockNumberMappingStorage
       .get(number)
-      .map(hash => BestBranchSubset(hash, number))
+      .map(hash => BestBranch(hash, number))
       .getOrElse(EmptyBranch)
   }
 
@@ -112,7 +112,7 @@ class BlockchainReader(
 
   /** Returns a block inside this branch based on its number */
   def getBlockByNumber(branch: Branch, number: BigInt): Option[Block] = branch match {
-    case BestBranchSubset(_, tipBlockNumber) =>
+    case BestBranch(_, tipBlockNumber) =>
       if (tipBlockNumber >= number && number >= 0) {
         for {
           hash <- getHashByBlockNumber(number)
@@ -124,7 +124,7 @@ class BlockchainReader(
 
   /** Returns a block hash for the block at the given height if any */
   def getHashByBlockNumber(branch: Branch, number: BigInt): Option[ByteString] = branch match {
-    case BestBranchSubset(_, tipBlockNumber) =>
+    case BestBranch(_, tipBlockNumber) =>
       if (tipBlockNumber >= number && number >= 0) {
         blockNumberMappingStorage.get(number)
       } else None
@@ -134,7 +134,7 @@ class BlockchainReader(
 
   /** Checks if given block hash is in this chain. (i.e. is an ancestor of the tip block) */
   def isInChain(branch: Branch, hash: ByteString): Boolean = branch match {
-    case BestBranchSubset(_, tipBlockNumber) =>
+    case BestBranch(_, tipBlockNumber) =>
       (for {
         header <- getBlockHeaderByHash(hash) if header.number <= tipBlockNumber
         hash <- getHashByBlockNumber(branch, header.number)

src/main/scala/io/iohk/ethereum/domain/branch/Branch.scala

@@ -4,6 +4,6 @@ import akka.util.ByteString
 
 sealed trait Branch
 
-case class BestBranchSubset(tipBlockHash: ByteString, tipBlockNumber: BigInt) extends Branch
+case class BestBranch(tipBlockHash: ByteString, tipBlockNumber: BigInt) extends Branch
 
 case object EmptyBranch extends Branch