Rename 'functionName' param to 'function'; fix chain config msg

Author: Łukasz Gąsior

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

@@ -122,7 +122,7 @@ object EthService {
     gas: Option[BigInt],
     gasPrice: BigInt,
     value: BigInt,
-    functionName: Option[String] = None,
+    function: Option[String] = None,
     arguments: Option[Seq[ByteString]] = None,
     contractCode: Option[ByteString])
 
@@ -571,8 +571,8 @@ class EthService(
     import req.tx
 
     val args = tx.arguments.getOrElse(Nil)
-    val dataEither = (tx.functionName, tx.contractCode) match {
-      case (Some(functionName), None) => Right(rlp.encode(RLPList(functionName, args)))
+    val dataEither = (tx.function, tx.contractCode) match {
+      case (Some(function), None) => Right(rlp.encode(RLPList(function, args)))
       case (None, Some(contractCode)) => Right(rlp.encode(RLPList(contractCode, args)))
       case _ => Left(JsonRpcErrors.InvalidParams("Iele transaction should contain either functionName or contractCode"))
     }

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

@@ -19,7 +19,7 @@ object IeleJsonMethodsImplicits extends JsonMethodsImplicits {
       gas <- optionalQuantity(obj \ "gas")
       gasPrice <- optionalQuantity(obj \ "gasPrice")
       value <- optionalQuantity(obj \ "value")
-      functionName = (obj \ "functionName").extractOpt[String]
+      function = (obj \ "function").extractOpt[String]
       contractCode <- toEitherOpt((obj \ "contractCode").extractOpt[String].map(extractBytes))
       arguments = (obj \ "arguments").extractOpt[Seq[String]].map(_.map(in => ByteString(decode(in))))
     } yield IeleCallTx(
@@ -28,7 +28,7 @@ object IeleJsonMethodsImplicits extends JsonMethodsImplicits {
       gas = gas,
       gasPrice = gasPrice.getOrElse(0),
       value = value.getOrElse(0),
-      functionName = functionName,
+      function = function,
       contractCode = contractCode,
       arguments = arguments)
   }
@@ -78,7 +78,7 @@ object IeleJsonMethodsImplicits extends JsonMethodsImplicits {
 
       nonce <- optionalQuantity("nonce")
 
-      functionName = input.get("functionName").flatMap(_.extractOpt[String])
+      function = input.get("function").flatMap(_.extractOpt[String])
 
       arguments = input.get("arguments").flatMap(_.extractOpt[Seq[String]].map(_.map(in => ByteString(decode(in)))))
 
@@ -88,7 +88,7 @@ object IeleJsonMethodsImplicits extends JsonMethodsImplicits {
         case None => Right(None)
       }
 
-    } yield IeleTransactionRequest(from, to, value, gas, gasPrice, nonce, functionName, arguments, contractCode)
+    } yield IeleTransactionRequest(from, to, value, gas, gasPrice, nonce, function, arguments, contractCode)
   }
 
   implicit val iele_sendTransaction = new JsonDecoder[SendIeleTransactionRequest] {

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

@@ -166,8 +166,8 @@ class PersonalService(
     import request.tx
 
     val args = tx.arguments.getOrElse(Nil)
-    val dataEither = (tx.functionName, tx.contractCode) match {
-      case (Some(functionName), None) => Right(rlp.encode(RLPList(functionName, args)))
+    val dataEither = (tx.function, tx.contractCode) match {
+      case (Some(function), None) => Right(rlp.encode(RLPList(function, args)))
       case (None, Some(contractCode)) => Right(rlp.encode(RLPList(contractCode, args)))
       case _ => Left(JsonRpcErrors.InvalidParams("Iele transaction should contain either functionName or contractCode"))
     }

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

@@ -26,13 +26,13 @@ object TestJsonMethodsImplicits extends JsonMethodsImplicits {
     private def extractBlockchainParams(blockchainParamsJson: JValue): Either[JsonRpcError, BlockchainParams] = {
       for {
         eIP150ForkBlock <- extractQuantity(blockchainParamsJson \ "EIP150ForkBlock")
-        eIP158ForkBlock <- extractQuantity(blockchainParamsJson \ "EIP150ForkBlock")
-        accountStartNonce <- extractQuantity(blockchainParamsJson \ "EIP150ForkBlock")
+        eIP158ForkBlock <- extractQuantity(blockchainParamsJson \ "EIP158ForkBlock")
+        accountStartNonce <- extractQuantity(blockchainParamsJson \ "accountStartNonce")
         allowFutureBlocks <- Try((blockchainParamsJson \ "allowFutureBlocks").extract[Boolean]).toEither.left.map(_ => InvalidParams())
-        blockReward <- extractQuantity(blockchainParamsJson \ "EIP150ForkBlock")
-        byzantiumForkBlock <- extractQuantity(blockchainParamsJson \ "EIP150ForkBlock")
-        homesteadForkBlock <- extractQuantity(blockchainParamsJson \ "EIP150ForkBlock")
-        maximumExtraDataSize <- extractQuantity(blockchainParamsJson \ "EIP150ForkBlock")
+        blockReward <- extractQuantity(blockchainParamsJson \ "blockReward")
+        byzantiumForkBlock <- extractQuantity(blockchainParamsJson \ "byzantiumForkBlock")
+        homesteadForkBlock <- extractQuantity(blockchainParamsJson \ "homesteadForkBlock")
+        maximumExtraDataSize <- extractQuantity(blockchainParamsJson \ "maximumExtraDataSize")
       } yield BlockchainParams(eIP150ForkBlock, eIP158ForkBlock, accountStartNonce, allowFutureBlocks, blockReward,
         byzantiumForkBlock, homesteadForkBlock, maximumExtraDataSize)
     }

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

@@ -33,6 +33,6 @@ case class IeleTransactionRequest(
     gasLimit: Option[BigInt] = None,
     gasPrice: Option[BigInt] = None,
     nonce: Option[BigInt] = None,
-    functionName: Option[String] = None,
+    function: Option[String] = None,
     arguments: Option[Seq[ByteString]] = None,
     contractCode: Option[ByteString])