JSON RPC methods that used transaction as payload now only takes 1 param

lib/archethic_web/api/jsonrpc/methods/estimate_transaction_fee.ex

@@ -19,8 +19,8 @@ defmodule ArchethicWeb.API.JsonRPC.Method.EstimateTransactionFee do
   """
   @spec validate_params(param :: map()) ::
           {:ok, params :: Transaction.t()} | {:error, reasons :: list()}
-  def validate_params(params) do
-    case TransactionPayload.changeset(params) do
+  def validate_params(%{"transaction" => transaction_params}) do
+    case TransactionPayload.changeset(transaction_params) do
       changeset = %{valid?: true} ->
         tx = changeset |> TransactionPayload.to_map() |> Transaction.cast()
         {:ok, tx}
@@ -32,6 +32,8 @@ defmodule ArchethicWeb.API.JsonRPC.Method.EstimateTransactionFee do
     end
   end
 
+  def validate_params(_), do: {:error, %{transaction: ["is required"]}}
+
   @doc """
   Execute the function to send a new tranaction in the network
   """

lib/archethic_web/api/jsonrpc/methods/send_transaction.ex

@@ -19,8 +19,8 @@ defmodule ArchethicWeb.API.JsonRPC.Method.SendTransaction do
   """
   @spec validate_params(param :: map()) ::
           {:ok, params :: Transaction.t()} | {:error, reasons :: list()}
-  def validate_params(params) do
-    case TransactionPayload.changeset(params) do
+  def validate_params(%{"transaction" => transaction_params}) do
+    case TransactionPayload.changeset(transaction_params) do
       changeset = %{valid?: true} ->
         tx = changeset |> TransactionPayload.to_map() |> Transaction.cast()
         {:ok, tx}
@@ -32,6 +32,8 @@ defmodule ArchethicWeb.API.JsonRPC.Method.SendTransaction do
     end
   end
 
+  def validate_params(_), do: {:error, %{transaction: ["is required"]}}
+
   @doc """
   Execute the function to send a new tranaction in the network
   """

lib/archethic_web/api/jsonrpc/methods/simulate_contract_execution.ex

@@ -22,8 +22,8 @@ defmodule ArchethicWeb.API.JsonRPC.Method.SimulateContractExecution do
   """
   @spec validate_params(param :: map()) ::
           {:ok, params :: Transaction.t()} | {:error, reasons :: list()}
-  def validate_params(params) do
-    case TransactionPayload.changeset(params) do
+  def validate_params(%{"transaction" => transaction_params}) do
+    case TransactionPayload.changeset(transaction_params) do
       changeset = %{valid?: true} ->
         tx = changeset |> TransactionPayload.to_map() |> Transaction.cast()
         {:ok, tx}
@@ -35,6 +35,8 @@ defmodule ArchethicWeb.API.JsonRPC.Method.SimulateContractExecution do
     end
   end
 
+  def validate_params(_), do: {:error, %{transaction: ["is required"]}}
+
   @doc """
   Execute the function to send a new tranaction in the network
   """

test/archethic_web/api/jsonrpc/controllers/jsonrpc_controller_test.exs

@@ -88,7 +88,7 @@ defmodule ArchethicWeb.API.JsonRPCControllerTest do
   defp valid_rpc_request(opts \\ []) do
     id = Keyword.get(opts, :id, 1)
     method = Keyword.get(opts, :method, "send_transaction")
-    params = Keyword.get(opts, :params, valid_tx_param())
+    params = Keyword.get(opts, :params, %{"transaction" => valid_tx_param()})
 
     %{
       "jsonrpc" => "2.0",

test/archethic_web/api/jsonrpc/methods/estimate_transaction_fee_test.exs

@@ -30,6 +30,15 @@ defmodule ArchethicWeb.API.JsonRPC.Methods.EstimateTransactionFeeTest do
   end
 
   describe "validate_params" do
+    test "should send error when transaction key is missing" do
+      assert {:error,
+              %{
+                transaction: [
+                  "is required"
+                ]
+              }} = EstimateTransactionFee.validate_params(%{})
+    end
+
     test "should send bad_request response for invalid transaction body" do
       assert {:error,
               %{
@@ -54,7 +63,7 @@ defmodule ArchethicWeb.API.JsonRPC.Methods.EstimateTransactionFeeTest do
                 version: [
                   "can't be blank"
                 ]
-              }} = EstimateTransactionFee.validate_params(%{})
+              }} = EstimateTransactionFee.validate_params(%{"transaction" => %{}})
     end
   end
 

test/archethic_web/api/jsonrpc/methods/send_transaction_test.exs

@@ -41,6 +41,15 @@ defmodule ArchethicWeb.API.JsonRPC.Methods.SendTransactionTest do
   end
 
   describe "validate_params" do
+    test "should send error when transaction key is missing" do
+      assert {:error,
+              %{
+                transaction: [
+                  "is required"
+                ]
+              }} = SendTransaction.validate_params(%{})
+    end
+
     test "should send bad_request response for invalid transaction body" do
       assert {:error,
               %{
@@ -65,7 +74,7 @@ defmodule ArchethicWeb.API.JsonRPC.Methods.SendTransactionTest do
                 version: [
                   "can't be blank"
                 ]
-              }} = SendTransaction.validate_params(%{})
+              }} = SendTransaction.validate_params(%{"transaction" => %{}})
     end
   end
 

test/archethic_web/api/jsonrpc/methods/simulate_contract_execution_test.exs

@@ -39,6 +39,15 @@ defmodule ArchethicWeb.API.JsonRPC.Methods.SimulateContractExecutionTest do
   end
 
   describe "validate_params" do
+    test "should send error when transaction key is missing" do
+      assert {:error,
+              %{
+                transaction: [
+                  "is required"
+                ]
+              }} = SimulateContractExecution.validate_params(%{})
+    end
+
     test "should send bad_request response for invalid transaction body" do
       assert {:error,
               %{
@@ -63,7 +72,7 @@ defmodule ArchethicWeb.API.JsonRPC.Methods.SimulateContractExecutionTest do
                 version: [
                   "can't be blank"
                 ]
-              }} = SimulateContractExecution.validate_params(%{})
+              }} = SimulateContractExecution.validate_params(%{"transaction" => %{}})
     end
   end