Skip to content

Commit 64e3609

Browse files
Qwerty5UiopQwerty5Uiop
authored
chore: Add missing TokenBalance.Current launch in tests (blockscout#14076)
1 parent bc2af4c commit 64e3609

8 files changed

Lines changed: 39 additions & 2 deletions

File tree

‎apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do
1212
alias Indexer.Block.Catchup
1313
alias Indexer.Block.Catchup.MissingRangesCollector
1414
alias Indexer.Fetcher.CoinBalance.Catchup, as: CoinBalanceCatchup
15+
alias Indexer.Fetcher.TokenBalance.Current, as: TokenBalanceCurrent
1516
alias Indexer.Fetcher.TokenBalance.Historical, as: TokenBalanceHistorical
1617

1718
alias Indexer.Fetcher.{
@@ -235,6 +236,7 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do
235236
ContractCode.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
236237
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
237238
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
239+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
238240
ReplacedTransaction.Supervisor.Case.start_supervised!()
239241

240242
UncleBlock.Supervisor.Case.start_supervised!(
@@ -450,6 +452,7 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do
450452
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
451453
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
452454
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
455+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
453456
ReplacedTransaction.Supervisor.Case.start_supervised!()
454457

455458
# from `setup :state`
@@ -541,6 +544,7 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do
541544
ContractCode.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
542545
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
543546
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
547+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
544548
ReplacedTransaction.Supervisor.Case.start_supervised!()
545549

546550
UncleBlock.Supervisor.Case.start_supervised!(

‎apps/indexer/test/indexer/block/catchup/fetcher_test.exs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
1515
alias Indexer.Fetcher.CoinBalance.Catchup, as: CoinBalanceCatchup
1616
alias Indexer.Fetcher.{BlockReward, InternalTransaction, Token, UncleBlock}
1717
alias Indexer.Fetcher.OnDemand.ContractCreator, as: ContractCreatorOnDemand
18+
alias Indexer.Fetcher.TokenBalance.Current, as: TokenBalanceCurrent
1819
alias Indexer.Fetcher.TokenBalance.Historical, as: TokenBalanceHistorical
1920

2021
@moduletag capture_log: true
@@ -55,6 +56,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
5556
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
5657
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
5758
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
59+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
5860

5961
Indexer.Fetcher.Filecoin.AddressInfo.Supervisor.Case.start_supervised!(
6062
json_rpc_named_arguments: json_rpc_named_arguments
@@ -187,6 +189,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
187189
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
188190
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
189191
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
192+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
190193
MissingRangesCollector.start_link([])
191194

192195
latest_block_number = 2
@@ -347,6 +350,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
347350
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
348351
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
349352
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
353+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
350354
MissingRangesCollector.start_link([])
351355

352356
latest_block_number = 2
@@ -504,6 +508,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
504508
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
505509
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
506510
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
511+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
507512
MissingRangesCollector.start_link([])
508513

509514
latest_block_number = 2
@@ -708,6 +713,7 @@ defmodule Indexer.Block.Catchup.FetcherTest do
708713
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
709714
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
710715
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
716+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
711717
MissingRangesCollector.start_link([])
712718

713719
latest_block_number = 3

‎apps/indexer/test/indexer/block/fetcher_test.exs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ defmodule Indexer.Block.FetcherTest do
1616
alias Indexer.BufferedTask
1717
alias Indexer.Fetcher.CoinBalance.Catchup, as: CoinBalanceCatchup
1818
alias Indexer.Fetcher.OnDemand.ContractCreator, as: ContractCreatorOnDemand
19+
alias Indexer.Fetcher.TokenBalance.Current, as: TokenBalanceCurrent
1920
alias Indexer.Fetcher.TokenBalance.Historical, as: TokenBalanceHistorical
2021

2122
alias Indexer.Fetcher.{
@@ -70,6 +71,7 @@ defmodule Indexer.Block.FetcherTest do
7071
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
7172
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
7273
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
74+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
7375
ReplacedTransaction.Supervisor.Case.start_supervised!()
7476
{:ok, _pid} = ContractCreatorOnDemand.start_link([[], []])
7577

@@ -823,6 +825,7 @@ defmodule Indexer.Block.FetcherTest do
823825
InternalTransaction.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
824826
Token.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
825827
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
828+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
826829
ReplacedTransaction.Supervisor.Case.start_supervised!()
827830
{:ok, _pid} = ContractCreatorOnDemand.start_link([[], []])
828831
start_supervised!({Task.Supervisor, name: Indexer.TaskSupervisor})

‎apps/indexer/test/indexer/block/realtime/fetcher_test.exs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ defmodule Indexer.Block.Realtime.FetcherTest do
2121
}
2222

2323
alias Indexer.Fetcher.OnDemand.ContractCreator, as: ContractCreatorOnDemand
24+
alias Indexer.Fetcher.TokenBalance.Current, as: TokenBalanceCurrent
2425
alias Indexer.Fetcher.TokenBalance.Historical, as: TokenBalanceHistorical
2526

2627
@moduletag capture_log: true
@@ -52,6 +53,7 @@ defmodule Indexer.Block.Realtime.FetcherTest do
5253
}
5354

5455
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
56+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
5557
CoinBalanceRealtime.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
5658
{:ok, _pid} = ContractCreatorOnDemand.start_link([[], []])
5759

‎apps/indexer/test/indexer/fetcher/internal_transaction_test.exs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
1313
alias Explorer.Chain.{Block, PendingBlockOperation, PendingTransactionOperation}
1414
alias Explorer.Chain.Import.Runner.Blocks
1515
alias Indexer.Fetcher.CoinBalance.Catchup, as: CoinBalanceCatchup
16-
alias Indexer.Fetcher.{InternalTransaction, PendingTransaction, TokenBalance}
16+
alias Indexer.Fetcher.{InternalTransaction, PendingTransaction}
17+
alias Indexer.Fetcher.TokenBalance.Current, as: TokenBalanceCurrent
18+
alias Indexer.Fetcher.TokenBalance.Historical, as: TokenBalanceHistorical
1719

1820
# MUST use global mode because we aren't guaranteed to get PendingTransactionFetcher's pid back fast enough to `allow`
1921
# it to use expectations and stubs from test's pid.
@@ -637,7 +639,8 @@ defmodule Indexer.Fetcher.InternalTransactionTest do
637639
# parsing the internal transactions
638640
if @chain_identity == {:optimism, :celo} do
639641
defp start_token_balance_fetcher(json_rpc_named_arguments) do
640-
TokenBalance.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
642+
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
643+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
641644
end
642645
else
643646
defp start_token_balance_fetcher(_json_rpc_named_arguments), do: :ok

‎apps/indexer/test/indexer/token_balances_test.exs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ defmodule Indexer.TokenBalancesTest do
55
doctest Indexer.TokenBalances
66

77
alias Indexer.TokenBalances
8+
alias Indexer.Fetcher.TokenBalance.Current, as: TokenBalanceCurrent
89
alias Indexer.Fetcher.TokenBalance.Historical, as: TokenBalanceHistorical
910
alias Explorer.Chain.Hash
1011

@@ -17,6 +18,7 @@ defmodule Indexer.TokenBalancesTest do
1718
describe "fetch_token_balances_from_blockchain/2" do
1819
setup %{json_rpc_named_arguments: json_rpc_named_arguments} do
1920
TokenBalanceHistorical.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
21+
TokenBalanceCurrent.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments)
2022

2123
:ok
2224
end

‎apps/indexer/test/support/indexer/fetcher/token_balance_current_supervisor_case.ex‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
defmodule Indexer.Fetcher.TokenBalance.Current.Supervisor.Case do
2+
alias Indexer.Fetcher.TokenBalance.Current, as: TokenBalanceCurrent
3+
4+
def start_supervised!(fetcher_arguments \\ []) when is_list(fetcher_arguments) do
5+
merged_fetcher_arguments =
6+
Keyword.merge(
7+
fetcher_arguments,
8+
flush_interval: 50,
9+
max_batch_size: 1,
10+
max_concurrency: 1
11+
)
12+
13+
[merged_fetcher_arguments]
14+
|> TokenBalanceCurrent.Supervisor.child_spec()
15+
|> ExUnit.Callbacks.start_supervised!()
16+
end
17+
end

apps/indexer/test/support/indexer/fetcher/token_balance_supervisor_case.ex renamed to apps/indexer/test/support/indexer/fetcher/token_balance_historical_supervisor_case.ex

File renamed without changes.

0 commit comments

Comments
 (0)