From 5333e3c5421cbcbfe09dc68f6772904f92741a91 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 3 Dec 2019 12:20:34 +0300 Subject: [PATCH] Revert "fix address sum cache" --- CHANGELOG.md | 1 - .../api/rpc/stats_controller_test.exs | 2 -- .../lib/explorer/chain/cache/address_sum.ex | 16 +++++----------- .../explorer/chain/cache/address_sum_test.exs | 2 +- .../runner/address/token_balances_test.exs | 2 +- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dc425ea27..62ce88bd8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ### Features ### Fixes -- [#2901](https://github.com/poanetwork/blockscout/pull/2901) - fix address sum cache ### Chore diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs index 5025f5db9e..a57db2221b 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs @@ -106,8 +106,6 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do describe "ethsupply" do test "returns total supply from DB", %{conn: conn} do - insert(:address, fetched_coin_balance: 6) - params = %{ "module" => "stats", "action" => "ethsupply" diff --git a/apps/explorer/lib/explorer/chain/cache/address_sum.ex b/apps/explorer/lib/explorer/chain/cache/address_sum.ex index 4a66e1369c..b0d3326312 100644 --- a/apps/explorer/lib/explorer/chain/cache/address_sum.ex +++ b/apps/explorer/lib/explorer/chain/cache/address_sum.ex @@ -16,13 +16,11 @@ defmodule Explorer.Chain.Cache.AddressSum do alias Explorer.Chain defp handle_fallback(:sum) do - result = fetch_from_db() + # This will get the task PID if one exists and launch a new task if not + # See next `handle_fallback` definition + get_async_task() - if Application.get_env(:explorer, __MODULE__)[:enabled] do - {:update, result} - else - {:return, result} - end + {:return, nil} end defp handle_fallback(:async_task) do @@ -31,7 +29,7 @@ defmodule Explorer.Chain.Cache.AddressSum do {:ok, task} = Task.start(fn -> try do - result = fetch_from_db() + result = Chain.fetch_sum_coin_total_supply() set_sum(result) rescue @@ -47,10 +45,6 @@ defmodule Explorer.Chain.Cache.AddressSum do {:update, task} end - defp fetch_from_db do - Chain.fetch_sum_coin_total_supply() - end - # By setting this as a `callback` an async task will be started each time the # `sum` expires (unless there is one already running) defp async_task_on_deletion({:delete, _, :sum}), do: get_async_task() diff --git a/apps/explorer/test/explorer/chain/cache/address_sum_test.exs b/apps/explorer/test/explorer/chain/cache/address_sum_test.exs index ac712c5287..707c70635f 100644 --- a/apps/explorer/test/explorer/chain/cache/address_sum_test.exs +++ b/apps/explorer/test/explorer/chain/cache/address_sum_test.exs @@ -12,7 +12,7 @@ defmodule Explorer.Chain.Cache.AddressSumTest do test "returns default address sum" do result = AddressSum.get_sum() - assert result == 0 + assert is_nil(result) end test "updates cache if initial value is zero" do diff --git a/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs b/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs index a35fbcc578..a40cd8599e 100644 --- a/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs +++ b/apps/explorer/test/explorer/chain/import/runner/address/token_balances_test.exs @@ -93,7 +93,7 @@ defmodule Explorer.Chain.Import.Runner.Address.TokenBalancesTest do value_fetched_at: DateTime.utc_now() } - run_changes(new_changes, options) + run_changes(new_changes, options) |> IO.inspect() end end