ETCM-697: Added initial import raw block test method

Signed-off-by: Igor Grahovac <[email protected]>

Author: Igor Grahovac

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

@@ -245,6 +245,8 @@ case class JsonRpcController(
       handle[ModifyTimestampRequest, ModifyTimestampResponse](testService.modifyTimestamp, req)
     case req @ JsonRpcRequest(_, "test_rewindToBlock", _, _) =>
       handle[RewindToBlockRequest, RewindToBlockResponse](testService.rewindToBlock, req)
+    case req @ JsonRpcRequest(_, "test_importRawBlock", _, _) =>
+      handle[ImportRawBlockRequest, ImportRawBlockResponse](testService.importRawBlock, req)
     case req @ JsonRpcRequest(_, "miner_setEtherbase", _, _) =>
       handle[SetEtherbaseRequest, SetEtherbaseResponse](testService.setEtherbase, req)
   }

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

@@ -131,6 +131,18 @@ object TestJsonMethodsImplicits extends JsonMethodsImplicits {
     override def encodeJson(t: RewindToBlockResponse): JValue = true
   }
 
+  implicit val test_importRawBlock = new JsonMethodDecoder[ImportRawBlockRequest]
+    with JsonEncoder[ImportRawBlockResponse] {
+    def decodeJson(params: Option[JArray]): Either[JsonRpcError, ImportRawBlockRequest] =
+      params match {
+        case Some(JArray(JString(blockRlp) :: Nil)) =>
+          Right(ImportRawBlockRequest(blockRlp))
+        case _ => Left(InvalidParams())
+      }
+
+    override def encodeJson(t: ImportRawBlockResponse): JValue = t.blockHash
+  }
+
   implicit val miner_setEtherbase = new JsonMethodDecoder[SetEtherbaseRequest] with JsonEncoder[SetEtherbaseResponse] {
     def decodeJson(params: Option[JArray]): Either[JsonRpcError, SetEtherbaseRequest] =
       params match {

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

@@ -2,20 +2,23 @@ package io.iohk.ethereum.jsonrpc
 
 import akka.actor.ActorRef
 import akka.util.{ByteString, Timeout}
-import cats.syntax.functor._
 import io.iohk.ethereum.blockchain.data.{GenesisAccount, GenesisData, GenesisDataLoader}
 import io.iohk.ethereum.consensus.ConsensusConfig
 import io.iohk.ethereum.consensus.blocks._
+import io.iohk.ethereum.domain.Block._
 import io.iohk.ethereum.domain.{Address, Block, BlockchainImpl, UInt256}
+import io.iohk.ethereum.ledger._
 import io.iohk.ethereum.testmode.{TestLedgerWrapper, TestmodeConsensus}
 import io.iohk.ethereum.transactions.PendingTransactionsManager
 import io.iohk.ethereum.transactions.PendingTransactionsManager.PendingTransactionsResponse
-import io.iohk.ethereum.utils.Logger
+import io.iohk.ethereum.utils.{ByteStringUtils, Logger}
 import monix.eval.Task
 import monix.execution.Scheduler
 import org.bouncycastle.util.encoders.Hex
+import io.iohk.ethereum.jsonrpc.JsonMethodsImplicits._
+
 import scala.concurrent.duration._
-import scala.util.Try
+import scala.util.{Failure, Success, Try}
 
 object TestService {
   case class GenesisParams(
@@ -56,6 +59,9 @@ object TestService {
 
   case class SetEtherbaseRequest(etherbase: Address)
   case class SetEtherbaseResponse()
+
+  case class ImportRawBlockRequest(blockRlp: String)
+  case class ImportRawBlockResponse(blockHash: String)
 }
 
 class TestService(
@@ -139,6 +145,27 @@ class TestService(
     Task.now(Right(RewindToBlockResponse()))
   }
 
+  def importRawBlock(request: ImportRawBlockRequest): ServiceResponse[ImportRawBlockResponse] = {
+    Try(decode(request.blockRlp).toBlock) match {
+      case Failure(_) => Task.now(Left(JsonRpcError(-1, "block validation failed!", None)))
+      case Success(value) => {
+        testLedgerWrapper.ledger
+          .importBlock(value)
+          .flatMap(handleResult)
+      }
+    }
+  }
+
+  private def handleResult(blockImportResult: BlockImportResult): ServiceResponse[ImportRawBlockResponse] = {
+    blockImportResult match {
+      case BlockImportedToTop(blockImportData) => {
+        consensus.blockTimestamp += 1
+        Task.now(Right(ImportRawBlockResponse(ByteStringUtils.hash2string(blockImportData.head.block.hash))))
+      }
+      case _ => Task.now(Left(JsonRpcError(-1, "block validation failed!", None)))
+    }
+  }
+
   def setEtherbase(req: SetEtherbaseRequest): ServiceResponse[SetEtherbaseResponse] = {
     etherbase = req.etherbase
     Task.now(Right(SetEtherbaseResponse()))