Get previous oracle chain data (#776)

* Fix transaction fee API with the previous price * Get previous oracle uco price
archethic-foundation · Dec 14, 2022 · 3bc00ce · 3bc00ce
1 parent c2c13c6
commit 3bc00ce
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/lib/archethic/oracle_chain/mem_table.ex b/lib/archethic/oracle_chain/mem_table.ex
@@ -77,19 +77,13 @@ defmodule Archethic.OracleChain.MemTable do
       date
       |> DateTime.to_unix()
 
-    case :ets.lookup(:archethic_oracle, {timestamp, type}) do
-      [] ->
-        case :ets.prev(:archethic_oracle, {timestamp, type}) do
-          :"$end_of_table" ->
-            {:error, :not_found}
-
-          key = {time, _} ->
-            [{_, data}] = :ets.lookup(:archethic_oracle, key)
-            {:ok, data, DateTime.from_unix!(time)}
-        end
+    case :ets.prev(:archethic_oracle, {timestamp, type}) do
+      :"$end_of_table" ->
+        {:error, :not_found}
 
-      [{_, data}] ->
-        {:ok, data, date}
+      key = {time, _} ->
+        [{_, data}] = :ets.lookup(:archethic_oracle, key)
+        {:ok, data, DateTime.from_unix!(time)}
     end
   end
 

diff --git a/lib/archethic_web/controllers/api/transaction_controller.ex b/lib/archethic_web/controllers/api/transaction_controller.ex
@@ -145,9 +145,13 @@ defmodule ArchethicWeb.API.TransactionController do
       changeset = %{valid?: true} ->
         timestamp = DateTime.utc_now()
 
-        uco_price = OracleChain.get_uco_price(timestamp)
-        uco_eur = uco_price |> Keyword.fetch!(:eur)
-        uco_usd = uco_price |> Keyword.fetch!(:usd)
+        previous_price =
+          timestamp
+          |> OracleChain.get_last_scheduling_date()
+          |> OracleChain.get_uco_price()
+
+        uco_eur = previous_price |> Keyword.fetch!(:eur)
+        uco_usd = previous_price |> Keyword.fetch!(:usd)
 
         fee =
           changeset

diff --git a/test/archethic/oracle_chain/mem_table_loader_test.exs b/test/archethic/oracle_chain/mem_table_loader_test.exs
@@ -21,7 +21,8 @@ defmodule Archethic.OracleChain.MemTableLoaderTest do
                  }
                })
 
-      assert {:ok, %{"eur" => 0.02}, _} = MemTable.get_oracle_data("uco", DateTime.utc_now())
+      assert {:ok, %{"eur" => 0.02}, _} =
+               MemTable.get_oracle_data("uco", DateTime.utc_now() |> DateTime.add(1000))
     end
 
     test "should load an oracle summary transaction and the related changes" do
@@ -43,7 +44,7 @@ defmodule Archethic.OracleChain.MemTableLoaderTest do
                })
 
       assert {:ok, %{"eur" => 0.07}, _} =
-               MemTable.get_oracle_data("uco", DateTime.from_unix!(1_614_677_925))
+               MemTable.get_oracle_data("uco", DateTime.from_unix!(1_614_677_927))
     end
   end
 end
diff --git a/test/archethic_web/controllers/api/transaction_controller_test.exs b/test/archethic_web/controllers/api/transaction_controller_test.exs
@@ -2,6 +2,7 @@ defmodule ArchethicWeb.API.TransactionControllerTest do
   use ArchethicCase
   use ArchethicWeb.ConnCase
 
+  alias Archethic.OracleChain
   alias Archethic.OracleChain.MemTable
   alias Archethic.P2P
   alias Archethic.P2P.Node
@@ -25,7 +26,12 @@ defmodule ArchethicWeb.API.TransactionControllerTest do
 
   describe "transaction_fee/2" do
     test "should send ok response and return fee for valid transaction body", %{conn: conn} do
-      MemTable.add_oracle_data("uco", %{"eur" => 0.2, "usd" => 0.2}, DateTime.utc_now())
+      previous_oracle_time =
+        DateTime.utc_now()
+        |> OracleChain.get_last_scheduling_date()
+        |> OracleChain.get_last_scheduling_date()
+
+      MemTable.add_oracle_data("uco", %{"eur" => 0.2, "usd" => 0.2}, previous_oracle_time)
 
       conn =
         post(conn, "/api/transaction_fee", %{