review fixes

rename putBestBlockData to putBestBlockInfo

avoid using magic number for block number in test

Author: Aurélien Richez

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

@@ -196,7 +196,11 @@ class BlockchainMock(genesisHash: ByteString) extends Blockchain {
 
   def getBestBlockNumber(): BigInt = ???
 
-  def saveBestKnownBlocks(bestBlockNumber: BigInt, latestCheckpointNumber: Option[BigInt] = None): Unit = ???
+  override def saveBestKnownBlocks(
+      bestBlockhash: ByteString,
+      bestBlockNumber: BigInt,
+      latestCheckpointNumber: Option[BigInt] = None
+  ): Unit = ???
 
   def getBestBlock(): Option[Block] = ???
 

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

@@ -37,7 +37,7 @@ class AppStateStorage(val dataSource: DataSource) extends TransactionalKeyValueS
       getBigInt(Keys.BestBlockNumber)
     )
 
-  def putBestBlockData(b: BestBlockInfo): DataSourceBatchUpdate =
+  def putBestBlockInfo(b: BestBlockInfo): 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

@@ -144,15 +144,15 @@ class BlockchainImpl(
     }
 
   private def saveBestKnownBlock(bestBlockHash: ByteString, bestBlockNumber: BigInt): Unit =
-    appStateStorage.putBestBlockData(BestBlockInfo(bestBlockHash, bestBlockNumber)).commit()
+    appStateStorage.putBestBlockInfo(BestBlockInfo(bestBlockHash, bestBlockNumber)).commit()
 
   private def saveBestKnownBlockAndLatestCheckpointNumber(
       bestBlockHash: ByteString,
       number: BigInt,
       latestCheckpointNumber: BigInt
   ): Unit =
     appStateStorage
-      .putBestBlockData(BestBlockInfo(bestBlockHash, number))
+      .putBestBlockInfo(BestBlockInfo(bestBlockHash, number))
       .and(appStateStorage.putLatestCheckpointBlockNumber(latestCheckpointNumber))
       .commit()
 
@@ -202,7 +202,7 @@ class BlockchainImpl(
      */
     val bestBlockNumberUpdates =
       if (appStateStorage.getBestBlockNumber() > potentialNewBestBlockNumber)
-        appStateStorage.putBestBlockData(BestBlockInfo(potentialNewBestBlockHash, potentialNewBestBlockNumber))
+        appStateStorage.putBestBlockInfo(BestBlockInfo(potentialNewBestBlockHash, potentialNewBestBlockNumber))
       else appStateStorage.emptyBatchUpdate
     val latestCheckpointNumberUpdates =
       if (appStateStorage.getLatestCheckpointBlockNumber() > newLatestCheckpointNumber)

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

@@ -32,14 +32,14 @@ class BlockchainWriter(
         block.header.number
       )
       appStateStorage
-        .putBestBlockData(BestBlockInfo(block.header.hash, block.header.number))
+        .putBestBlockInfo(BestBlockInfo(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.putBestBlockData(BestBlockInfo(block.header.hash, block.header.number))
+      appStateStorage.putBestBlockInfo(BestBlockInfo(block.header.hash, block.header.number))
     } else {
       appStateStorage.emptyBatchUpdate
     }

src/test/scala/io/iohk/ethereum/jsonrpc/JsonRpcControllerEthSpec.scala

@@ -416,7 +416,7 @@ class JsonRpcControllerEthSpec
     private val block: Block =
       Block(Fixtures.Blocks.Block3125369.header.copy(number = 42), Fixtures.Blocks.Block3125369.body)
     blockchainWriter.storeBlock(block).commit()
-    blockchain.saveBestKnownBlocks(block.hash, 42)
+    blockchain.saveBestKnownBlocks(block.hash, block.number)
 
     val request: JsonRpcRequest = newJsonRpcRequest("eth_gasPrice")