diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs index 5ab050aefc..68d2271c2b 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs @@ -76,7 +76,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do block = insert(:block, number: 0) transaction = insert(:transaction, from_address: address) |> with_block(block) - insert(:log, address: address, transaction: transaction, data: "0x010101") + insert(:log, block: block, address: address, transaction: transaction, data: "0x010101") params = params(api_params, [%{"address" => to_string(address.hash)}]) @@ -94,7 +94,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do block = insert(:block, number: 0) transaction = insert(:transaction, from_address: address) |> with_block(block) - insert(:log, address: address, transaction: transaction, data: "0x010101", first_topic: "0x01") + insert(:log, block: block, address: address, transaction: transaction, data: "0x010101", first_topic: "0x01") params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01"]}]) @@ -112,8 +112,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do block = insert(:block, number: 0) transaction = insert(:transaction, from_address: address) |> with_block(block) - insert(:log, address: address, transaction: transaction, data: "0x010101", first_topic: "0x01") - insert(:log, address: address, transaction: transaction, data: "0x020202", first_topic: "0x00") + insert(:log, address: address, block: block, transaction: transaction, data: "0x010101", first_topic: "0x01") + insert(:log, address: address, block: block, transaction: transaction, data: "0x020202", first_topic: "0x00") params = params(api_params, [%{"address" => to_string(address.hash), "topics" => [["0x01", "0x00"]]}]) @@ -127,14 +127,15 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do test "paginates logs", %{conn: conn, api_params: api_params} do contract_address = insert(:contract_address) + block = insert(:block) transaction = :transaction |> insert(to_address: contract_address) - |> with_block() + |> with_block(block) inserted_records = - insert_list(2000, :log, address: contract_address, transaction: transaction, first_topic: "0x01") + insert_list(2000, :log, block: block, address: contract_address, transaction: transaction, first_topic: "0x01") params = params(api_params, [%{"address" => to_string(contract_address), "topics" => [["0x01"]]}]) @@ -191,10 +192,11 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do transaction: transaction, data: "0x010101", first_topic: "0x01", - second_topic: "0x02" + second_topic: "0x02", + block: block ) - insert(:log, address: address, transaction: transaction, data: "0x020202", first_topic: "0x01") + insert(:log, block: block, address: address, transaction: transaction, data: "0x020202", first_topic: "0x01") params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01", "0x02"]}]) @@ -219,7 +221,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do transaction: transaction, data: "0x010101", first_topic: "0x01", - second_topic: "0x02" + second_topic: "0x02", + block: block ) insert(:log, @@ -227,7 +230,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do transaction: transaction, data: "0x020202", first_topic: "0x01", - second_topic: "0x03" + second_topic: "0x03", + block: block ) params = params(api_params, [%{"address" => to_string(address.hash), "topics" => ["0x01", ["0x02", "0x03"]]}]) @@ -341,11 +345,11 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do transaction2 = insert(:transaction, from_address: address) |> with_block(block2) transaction3 = insert(:transaction, from_address: address) |> with_block(block3) - insert(:log, address: address, transaction: transaction1, data: "0x010101") + insert(:log, block: block1, address: address, transaction: transaction1, data: "0x010101") - insert(:log, address: address, transaction: transaction2, data: "0x020202") + insert(:log, block: block2, address: address, transaction: transaction2, data: "0x020202") - insert(:log, address: address, transaction: transaction3, data: "0x030303") + insert(:log, block: block3, address: address, transaction: transaction3, data: "0x030303") changeset = Ecto.Changeset.change(block3, %{consensus: false}) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs index d83e530c28..416ad729fc 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs @@ -486,7 +486,8 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do address: address, transaction: transaction, first_topic: "first topic", - second_topic: "second topic" + second_topic: "second topic", + block: block ) params = %{ diff --git a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs index d6c278c1c8..4d724a673b 100644 --- a/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs +++ b/apps/explorer/test/explorer/chain/import/runner/blocks_test.exs @@ -115,22 +115,6 @@ defmodule Explorer.Chain.Import.Runner.BlocksTest do assert count(Address.CurrentTokenBalance) == count end - test "remove_nonconsensus_logs deletes nonconsensus logs", %{ - consensus_block: %{number: block_number} = block, - options: options - } do - old_block = insert(:block, number: block_number, consensus: true) - forked_transaction = :transaction |> insert() |> with_block(old_block) - %Log{transaction_hash: hash, index: index} = insert(:log, transaction: forked_transaction) - - assert count(Log) == 1 - - assert {:ok, %{remove_nonconsensus_logs: [%{transaction_hash: ^hash, index: ^index}]}} = - run_block_consensus_change(block, true, options) - - assert count(Log) == 0 - end - test "derive_address_current_token_balances inserts rows if there is an address_token_balance left for the rows deleted by delete_address_current_token_balances", %{consensus_block: %{number: block_number} = block, options: options} do token = insert(:token)