fix: allow retrieving the latest txs by hash (#1167)

Author: sborrazas

lib/ae_mdw/blocks.ex

@@ -161,15 +161,22 @@ defmodule AeMdw.Blocks do
 
   @spec fetch_txis_from_gen(State.t(), height()) :: Enumerable.t()
   def fetch_txis_from_gen(state, height) do
-    with {:ok, Model.block(tx_index: tx_index_start)}
-         when is_integer(tx_index_start) and tx_index_start >= 0 <-
-           State.get(state, @table, {height, -1}),
-         {:ok, Model.block(tx_index: tx_index_end)}
-         when is_integer(tx_index_end) and tx_index_end >= 0 <-
-           State.get(state, @table, {height + 1, -1}) do
-      tx_index_start..tx_index_end
-    else
-      _full_block_not_found -> []
+    case State.get(state, @table, {height, -1}) do
+      {:ok, Model.block(tx_index: tx_index_start)} ->
+        tx_index_end =
+          case State.get(state, @table, {height + 1, -1}) do
+            {:ok, Model.block(tx_index: tx_index_end)} -> tx_index_end - 1
+            :not_found -> DbUtil.last_txi!(state)
+          end
+
+        if tx_index_end >= tx_index_start do
+          tx_index_start..tx_index_end
+        else
+          []
+        end
+
+      :not_found ->
+        []
     end
   end
 

test/ae_mdw/blocks_test.exs

@@ -0,0 +1,33 @@
+defmodule AeMdw.BlocksTest do
+  use ExUnit.Case
+
+  alias AeMdw.Db.State
+  alias AeMdw.Db.MemStore
+  alias AeMdw.Db.Model
+  alias AeMdw.Db.NullStore
+  alias AeMdw.Db.Store
+  alias AeMdw.Blocks
+
+  require Model
+
+  describe "fetch_txis_from_gen/2" do
+    test "returns the range of txis from any two blocks" do
+      state =
+        NullStore.new()
+        |> MemStore.new()
+        |> Store.put(Model.Block, Model.block(index: {0, -1}, tx_index: 0))
+        |> Store.put(Model.Block, Model.block(index: {0, 0}, tx_index: 0))
+        |> Store.put(Model.Block, Model.block(index: {1, -1}, tx_index: 0))
+        |> Store.put(Model.Block, Model.block(index: {1, 0}, tx_index: 10))
+        |> Store.put(Model.Block, Model.block(index: {1, 1}, tx_index: 20))
+        |> Store.put(Model.Block, Model.block(index: {2, -1}, tx_index: 30))
+        |> Store.put(Model.Block, Model.block(index: {2, 0}, tx_index: 30))
+        |> Store.put(Model.Tx, Model.tx(index: 34))
+        |> State.new()
+
+      assert [] = Enum.to_list(Blocks.fetch_txis_from_gen(state, 0))
+      assert Enum.to_list(0..29) == Enum.to_list(Blocks.fetch_txis_from_gen(state, 1))
+      assert Enum.to_list(30..34) == Enum.to_list(Blocks.fetch_txis_from_gen(state, 2))
+    end
+  end
+end

test/integration/ae_mdw_web/controllers/tx_controller_test.exs

@@ -40,6 +40,18 @@ defmodule Integration.AeMdwWeb.TxControllerTest do
       assert %{"hash" => ^tx_hash} = body = json_response(conn, 200)
       assert %{body: ^body} = MainnetClient.get!(path)
     end
+
+    test "when getting the last tx by hash, it returns 200", %{conn: conn} do
+      assert %{"data" => [%{"hash" => tx_hash} = tx]} =
+               conn
+               |> get("/v2/txs", limit: 1)
+               |> json_response(200)
+
+      assert ^tx =
+               conn
+               |> get("/v2/txs/#{tx_hash}")
+               |> json_response(200)
+    end
   end
 
   describe "txi" do