ETCM-697: Fixed scalastyle issues

Author: Igor Grahovac

src/main/scala/io/iohk/ethereum/blockchain/data/GenesisDataLoader.scala

@@ -6,6 +6,7 @@ import io.iohk.ethereum.blockchain.data.GenesisDataLoader.JsonSerializers.{
   ByteStringJsonSerializer,
   UInt256JsonSerializer
 }
+import io.iohk.ethereum.db.storage.MptStorage
 import io.iohk.ethereum.db.storage.StateStorage.GenesisDataLoad
 import io.iohk.ethereum.rlp.RLPList
 import io.iohk.ethereum.utils.BlockchainConfig
@@ -92,24 +93,7 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
     val storage = stateStorage.getReadOnlyStorage
     val initalRootHash = MerklePatriciaTrie.EmptyRootHash
 
-    val stateMptRootHash = genesisData.alloc.zipWithIndex.foldLeft(initalRootHash) {
-      case (rootHash, ((address, genesisAccount), _)) =>
-        val mpt = MerklePatriciaTrie[Array[Byte], Account](rootHash, storage)
-        val paddedAddress = address.reverse.padTo(addressLength, "0").reverse.mkString
-        val stateRoot = mpt
-          .put(
-            crypto.kec256(Hex.decode(paddedAddress)),
-            Account(
-              nonce = genesisAccount.nonce
-                .getOrElse(blockchainConfig.accountStartNonce),
-              balance = genesisAccount.balance,
-              codeHash = genesisAccount.code.map(codeValue => crypto.kec256(codeValue)).getOrElse(Account.EmptyCodeHash)
-            )
-          )
-          .getRootHash
-        stateRoot
-    }
-
+    val stateMptRootHash = getGenesisStateRoot(genesisData, initalRootHash, storage)
     val header: BlockHeader = prepareHeader(genesisData, stateMptRootHash)
 
     log.debug(s"Prepared genesis header: $header")
@@ -138,6 +122,27 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
     }
   }
 
+  private def getGenesisStateRoot(genesisData: GenesisData, initalRootHash: Array[Byte], storage: MptStorage) = {
+    import MerklePatriciaTrie.defaultByteArraySerializable
+
+    genesisData.alloc.zipWithIndex.foldLeft(initalRootHash) { case (rootHash, ((address, genesisAccount), _)) =>
+      val mpt = MerklePatriciaTrie[Array[Byte], Account](rootHash, storage)
+      val paddedAddress = address.reverse.padTo(addressLength, "0").reverse.mkString
+      val stateRoot = mpt
+        .put(
+          crypto.kec256(Hex.decode(paddedAddress)),
+          Account(
+            nonce = genesisAccount.nonce
+              .getOrElse(blockchainConfig.accountStartNonce),
+            balance = genesisAccount.balance,
+            codeHash = genesisAccount.code.map(codeValue => crypto.kec256(codeValue)).getOrElse(Account.EmptyCodeHash)
+          )
+        )
+        .getRootHash
+      stateRoot
+    }
+  }
+
   private def prepareHeader(genesisData: GenesisData, stateMptRootHash: Array[Byte]) =
     BlockHeader(
       parentHash = zeros(hashLength),

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

@@ -64,11 +64,9 @@ class BlockPreparator(
       worldStateProxy
     } else {
       val blockNumber = block.header.number
-
       val minerRewardForBlock = blockRewardCalculator.calculateMiningRewardForBlock(blockNumber)
       val minerRewardForOmmers =
         blockRewardCalculator.calculateMiningRewardForOmmers(blockNumber, block.body.uncleNodesList.size)
-
       val minerAddress = Address(block.header.beneficiary)
       val treasuryAddress = blockchainConfig.treasuryAddress
       val existsTreasuryContract = worldStateProxy.getAccount(treasuryAddress).isDefined
@@ -92,7 +90,6 @@ class BlockPreparator(
           val treasuryReward = minerRewardForBlock * TreasuryRewardPercentageAfterECIP1098 / 100
           val worldAfterTreasuryReward =
             increaseAccountBalance(treasuryAddress, UInt256(treasuryReward))(worldAfterMinerReward)
-
           log.debug(
             s"Paying block $blockNumber reward of $minerReward to miner with address $minerAddress" +
               s"paying treasury reward of $treasuryReward to treasury with address $treasuryAddress"