[ETCM-846] review fixes

Author: Aurélien Richez

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

@@ -137,8 +137,8 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
             nonce = genesisAccount.nonce
               .getOrElse(blockchainConfig.accountStartNonce),
             balance = genesisAccount.balance,
-            codeHash = genesisAccount.code.map(codeValue => crypto.kec256(codeValue)).getOrElse(Account.EmptyCodeHash),
-            storageRoot = genesisAccount.storage.map(computeStorageRootHash).getOrElse(Account.EmptyStorageRootHash)
+            codeHash = genesisAccount.code.fold(Account.EmptyCodeHash)(codeValue => crypto.kec256(codeValue)),
+            storageRoot = genesisAccount.storage.fold(Account.EmptyStorageRootHash)(computeStorageRootHash)
           )
         )
         .getRootHash
@@ -152,12 +152,9 @@ class GenesisDataLoader(blockchain: Blockchain, blockchainConfig: BlockchainConf
       new SerializingMptStorage(new ArchiveNodeStorage(new NodeStorage(EphemDataSource())))
     )
 
-    val storageTrie = storage.foldLeft(emptyTrie) { (trie, tuple) =>
-      val (key, value) = tuple
-      if (value.isZero)
-        trie
-      else
-        trie.put(key, value)
+    val storageTrie = storage.foldLeft(emptyTrie) {
+      case (trie, (key, UInt256.Zero)) => trie
+      case (trie, (key, value)) => trie.put(key, value)
     }
 
     ByteString(storageTrie.getRootHash)

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

@@ -155,10 +155,10 @@ class TestService(
     // load the new genesis
     val genesisDataLoader = new GenesisDataLoader(blockchain, newBlockchainConfig)
     genesisDataLoader.loadGenesisData(genesisData)
-
     //save account codes to world state
     storeGenesisAccountCodes(genesisData.alloc)
     storeGenesisAccountStorageData(genesisData.alloc)
+
     // update test ledger with new config
     testLedgerWrapper.blockchainConfig = newBlockchainConfig
 
@@ -168,13 +168,11 @@ class TestService(
     SetChainParamsResponse().rightNow
   }
 
-  private def storeGenesisAccountCodes(accounts: Map[String, GenesisAccount]): Unit = {
-    for {
-      code <- accounts.map(pair => pair._2.code).collect { case Some(code) => code }
-    } {
-      blockchain.storeEvmCode(kec256(code), code).commit()
-    }
-  }
+  private def storeGenesisAccountCodes(accounts: Map[String, GenesisAccount]): Unit =
+    accounts
+      .map(pair => pair._2.code)
+      .collect { case Some(code) => code }
+      .foreach { code => blockchain.storeEvmCode(kec256(code), code).commit() }
 
   private def storeGenesisAccountStorageData(accounts: Map[String, GenesisAccount]): Unit = {
     val emptyStorage = domain.EthereumUInt256Mpt.storageMpt(
@@ -185,9 +183,9 @@ class TestService(
       .flatMap(pair => pair._2.storage)
       .map(accountStorage => accountStorage.filterNot { case (_, v) => v.isZero })
       .filter(_.nonEmpty)
-    for { storage <- storagesToPersist } {
-      storage.foldLeft(emptyStorage) { case (storage, (key, value)) => storage.put(key, value) }
-    }
+
+    //the identity map is needed to trigger an implicit conversion from UInt256 to BigInt
+    storagesToPersist.foreach(storage => emptyStorage.update(Nil, storage.toSeq.map { case (a, b) => (a, b) }))
   }
 
   def mineBlocks(request: MineBlocksRequest): ServiceResponse[MineBlocksResponse] = {