From ad1f1c1826f2f955142d7362d6377886eaa2b395 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 9 Sep 2019 12:47:08 +0300 Subject: [PATCH] Revert "Filter pending logs" --- CHANGELOG.md | 1 - .../lib/ethereum_jsonrpc/receipts.ex | 4 +--- .../test/indexer/block/fetcher/receipts_test.exs | 14 -------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ce0a42b7..b3f20f4061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -232,7 +232,6 @@ - [#2123](https://github.com/poanetwork/blockscout/pull/2123) - fix coins percentage view - [#2119](https://github.com/poanetwork/blockscout/pull/2119) - fix map logging - [#2130](https://github.com/poanetwork/blockscout/pull/2130) - fix navigation -- [#2148](https://github.com/poanetwork/blockscout/pull/2148) - filter pending logs - [#2147](https://github.com/poanetwork/blockscout/pull/2147) - add rsk format of checksum - [#2149](https://github.com/poanetwork/blockscout/pull/2149) - remove pending transaction count - [#2177](https://github.com/poanetwork/blockscout/pull/2177) - remove duplicate entries from UncleBlock's Fetcher diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex index 7028423f7a..e5d706589c 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex @@ -61,9 +61,7 @@ defmodule EthereumJSONRPC.Receipts do """ @spec elixir_to_logs(elixir) :: Logs.elixir() def elixir_to_logs(elixir) when is_list(elixir) do - elixir - |> Enum.flat_map(&Receipt.elixir_to_logs/1) - |> Enum.filter(&(Map.get(&1, "type") != "pending")) + Enum.flat_map(elixir, &Receipt.elixir_to_logs/1) end @doc """ diff --git a/apps/indexer/test/indexer/block/fetcher/receipts_test.exs b/apps/indexer/test/indexer/block/fetcher/receipts_test.exs index 35371b7c4a..95570db4a2 100644 --- a/apps/indexer/test/indexer/block/fetcher/receipts_test.exs +++ b/apps/indexer/test/indexer/block/fetcher/receipts_test.exs @@ -84,18 +84,6 @@ defmodule Indexer.Block.Fetcher.ReceiptsTest do "transactionIndex" => "0x0", "transactionLogIndex" => "0x0", "type" => "mined" - }, - %{ - "address" => "0x8bf38d4764929064f2d4d3a56520a76ab3df415c", - "blockHash" => nil, - "blockNumber" => nil, - "data" => "0x000000000000000000000000862d67cb0773ee3f8ce7ea89b328ffea861ab3ef", - "logIndex" => "0x1", - "topics" => ["0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22"], - "transactionHash" => "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5", - "transactionIndex" => "0x0", - "transactionLogIndex" => "0x0", - "type" => "pending" } ], "logsBloom" => @@ -158,8 +146,6 @@ defmodule Indexer.Block.Fetcher.ReceiptsTest do log[:transaction_hash] == "0x43bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5" && log[:block_number] == 46147 end) - - refute Enum.find(logs, fn log -> log[:type] == "pending" end) end end end