Rename BestBlockInfo to BlockInfo

Author: Aurélien Richez

src/main/scala/io/iohk/ethereum/db/storage/AppStateStorage.scala

@@ -9,7 +9,7 @@ import scala.collection.immutable.ArraySeq
 import io.iohk.ethereum.db.dataSource.DataSource
 import io.iohk.ethereum.db.dataSource.DataSourceBatchUpdate
 import io.iohk.ethereum.db.storage.AppStateStorage._
-import io.iohk.ethereum.domain.appstate.BestBlockInfo
+import io.iohk.ethereum.domain.appstate.BlockInfo
 import io.iohk.ethereum.utils.Hex
 
 /** This class is used to store app state variables
@@ -31,13 +31,13 @@ class AppStateStorage(val dataSource: DataSource) extends TransactionalKeyValueS
   def getBestBlockNumber(): BigInt =
     getBigInt(Keys.BestBlockNumber)
 
-  def getBestBlockInfo(): BestBlockInfo =
-    BestBlockInfo( // TODO ETCM-1090 provide the genesis hash as default
+  def getBestBlockInfo(): BlockInfo =
+    BlockInfo( // TODO ETCM-1090 provide the genesis hash as default
       get(Keys.BestBlockHash).map(v => ByteString(Hex.decode(v))).getOrElse(ByteString.empty),
       getBigInt(Keys.BestBlockNumber)
     )
 
-  def putBestBlockInfo(b: BestBlockInfo): DataSourceBatchUpdate =
+  def putBestBlockInfo(b: BlockInfo): DataSourceBatchUpdate =
     put(Keys.BestBlockNumber, b.number.toString)
       .and(put(Keys.BestBlockHash, Hex.toHexString(b.hash.toArray)))
 

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

@@ -7,7 +7,7 @@ import scala.annotation.tailrec
 import io.iohk.ethereum.db.dataSource.DataSourceBatchUpdate
 import io.iohk.ethereum.db.storage._
 import io.iohk.ethereum.domain
-import io.iohk.ethereum.domain.appstate.BestBlockInfo
+import io.iohk.ethereum.domain.appstate.BlockInfo
 import io.iohk.ethereum.jsonrpc.ProofService.StorageProof
 import io.iohk.ethereum.ledger.InMemoryWorldStateProxy
 import io.iohk.ethereum.ledger.InMemoryWorldStateProxyStorage
@@ -144,15 +144,15 @@ class BlockchainImpl(
     }
 
   private def saveBestKnownBlock(bestBlockHash: ByteString, bestBlockNumber: BigInt): Unit =
-    appStateStorage.putBestBlockInfo(BestBlockInfo(bestBlockHash, bestBlockNumber)).commit()
+    appStateStorage.putBestBlockInfo(BlockInfo(bestBlockHash, bestBlockNumber)).commit()
 
   private def saveBestKnownBlockAndLatestCheckpointNumber(
       bestBlockHash: ByteString,
       number: BigInt,
       latestCheckpointNumber: BigInt
   ): Unit =
     appStateStorage
-      .putBestBlockInfo(BestBlockInfo(bestBlockHash, number))
+      .putBestBlockInfo(BlockInfo(bestBlockHash, number))
       .and(appStateStorage.putLatestCheckpointBlockNumber(latestCheckpointNumber))
       .commit()
 
@@ -201,7 +201,7 @@ class BlockchainImpl(
      */
     val bestBlockNumberUpdates =
       if (appStateStorage.getBestBlockNumber() > potentialNewBestBlockNumber)
-        appStateStorage.putBestBlockInfo(BestBlockInfo(potentialNewBestBlockHash, potentialNewBestBlockNumber))
+        appStateStorage.putBestBlockInfo(BlockInfo(potentialNewBestBlockHash, potentialNewBestBlockNumber))
       else appStateStorage.emptyBatchUpdate
     val latestCheckpointNumberUpdates =
       if (appStateStorage.getLatestCheckpointBlockNumber() > newLatestCheckpointNumber)

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

@@ -11,7 +11,7 @@ import io.iohk.ethereum.db.storage.ChainWeightStorage
 import io.iohk.ethereum.db.storage.ReceiptStorage
 import io.iohk.ethereum.db.storage.TransactionMappingStorage
 import io.iohk.ethereum.db.storage.TransactionMappingStorage.TransactionLocation
-import io.iohk.ethereum.domain.appstate.BestBlockInfo
+import io.iohk.ethereum.domain.appstate.BlockInfo
 import io.iohk.ethereum.utils.Logger
 
 class BlockchainWriter(
@@ -32,14 +32,14 @@ class BlockchainWriter(
         block.header.number
       )
       appStateStorage
-        .putBestBlockInfo(BestBlockInfo(block.header.hash, block.header.number))
+        .putBestBlockInfo(BlockInfo(block.header.hash, block.header.number))
         .and(appStateStorage.putLatestCheckpointBlockNumber(block.header.number))
     } else if (saveAsBestBlock) {
       log.debug(
         "New best known block number - {}",
         block.header.number
       )
-      appStateStorage.putBestBlockInfo(BestBlockInfo(block.header.hash, block.header.number))
+      appStateStorage.putBestBlockInfo(BlockInfo(block.header.hash, block.header.number))
     } else {
       appStateStorage.emptyBatchUpdate
     }

src/main/scala/io/iohk/ethereum/domain/appstate/BestBlockInfo.scala renamed to src/main/scala/io/iohk/ethereum/domain/appstate/BlockInfo.scala

@@ -2,4 +2,4 @@ package io.iohk.ethereum.domain.appstate
 
 import akka.util.ByteString
 
-case class BestBlockInfo(hash: ByteString, number: BigInt)
+case class BlockInfo(hash: ByteString, number: BigInt)