ETCM-697: Fixed failing tests

Author: Igor Grahovac

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

@@ -188,7 +188,7 @@ object GenesisDataLoader {
 
     def deserializeUint256String(jv: JValue): UInt256 = jv match {
       case JString(s) =>
-        Try(UInt256(BigInt(1, Implicits.decode(s)))) match {
+        Try(UInt256(BigInt(s))) match {
           case Failure(_) => throw new RuntimeException("Cannot parse hex string: " + s)
           case Success(value) => value
         }

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

@@ -12,7 +12,6 @@ case class CheckpointResponse(signatures: Seq[ECDSASignature], signers: Seq[Byte
 trait BaseBlockResponse {
   def number: BigInt
   def hash: Option[ByteString]
-  def mixHash: Option[ByteString]
   def parentHash: ByteString
   def nonce: Option[ByteString]
   def sha3Uncles: ByteString
@@ -59,7 +58,6 @@ case class EthBlockResponse(
 case class BlockResponse(
     number: BigInt,
     hash: Option[ByteString],
-    mixHash: Option[ByteString],
     parentHash: ByteString,
     nonce: Option[ByteString],
     sha3Uncles: ByteString,
@@ -130,9 +128,8 @@ object BlockResponse {
     BlockResponse(
       number = block.header.number,
       hash = if (pendingBlock) None else Some(block.header.hash),
-      mixHash = if (block.header.mixHash.isEmpty) None else Some(block.header.mixHash),
       parentHash = block.header.parentHash,
-      nonce = if (block.header.nonce.isEmpty) None else Some(block.header.nonce),
+      nonce = if (pendingBlock) None else Some(block.header.nonce),
       sha3Uncles = block.header.ommersHash,
       logsBloom = block.header.logsBloom,
       transactionsRoot = block.header.transactionsRoot,

src/main/scala/io/iohk/ethereum/testmode/TestEthBlockServiceWrapper.scala

@@ -1,6 +1,6 @@
 package io.iohk.ethereum.testmode
 
-import io.iohk.ethereum.domain.{Block, Blockchain}
+import io.iohk.ethereum.domain.{Block, Blockchain, UInt256}
 import io.iohk.ethereum.jsonrpc.EthBlocksService.{BlockByBlockHashResponse, BlockByNumberResponse}
 import io.iohk.ethereum.jsonrpc.{
   BaseBlockResponse,
@@ -62,9 +62,9 @@ class TestEthBlockServiceWrapper(blockchain: Blockchain, ledger: Ledger, consens
   private def toEthResponse(block: Block, response: BaseBlockResponse) = EthBlockResponse(
     response.number,
     response.hash,
-    response.mixHash,
+    if (block.header.mixHash.isEmpty) Some(UInt256.Zero.bytes) else Some(block.header.mixHash),
     response.parentHash,
-    response.nonce,
+    if (block.header.nonce.isEmpty) None else Some(block.header.nonce),
     response.sha3Uncles,
     response.logsBloom,
     response.transactionsRoot,