Merge pull request #3046 from poanetwork/vb-missing-conn-fix

Fix missing conn in eex template
pull/3047/head
Victor Baranov 5 years ago committed by GitHub
commit d900c599a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CHANGELOG.md
  2. 1
      apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex
  3. 6
      apps/block_scout_web/lib/block_scout_web/channels/transaction_channel.ex
  4. 11
      apps/indexer/lib/indexer/block/catchup/bound_interval_supervisor.ex

@ -6,7 +6,7 @@
- [#3044](https://github.com/poanetwork/blockscout/pull/3044) - Prevent division by zero on /accounts page - [#3044](https://github.com/poanetwork/blockscout/pull/3044) - Prevent division by zero on /accounts page
- [#3043](https://github.com/poanetwork/blockscout/pull/3043) - Extract host name for split couple of indexer and web app - [#3043](https://github.com/poanetwork/blockscout/pull/3043) - Extract host name for split couple of indexer and web app
- [#3042](https://github.com/poanetwork/blockscout/pull/3042) - Speedup pending txs list query - [#3042](https://github.com/poanetwork/blockscout/pull/3042) - Speedup pending txs list query
- [#2944](https://github.com/poanetwork/blockscout/pull/2944) - Split js logic into multiple files - [#2944](https://github.com/poanetwork/blockscout/pull/2944), [#3046](https://github.com/poanetwork/blockscout/pull/3046) - Split js logic into multiple files
### Chore ### Chore

@ -127,6 +127,7 @@ defmodule BlockScoutWeb.AddressChannel do
View.render_to_string( View.render_to_string(
TransactionView, TransactionView,
"_tile.html", "_tile.html",
conn: socket,
current_address: address, current_address: address,
transaction: transaction transaction: transaction
) )

@ -29,7 +29,8 @@ defmodule BlockScoutWeb.TransactionChannel do
View.render_to_string( View.render_to_string(
TransactionView, TransactionView,
"_tile.html", "_tile.html",
transaction: transaction transaction: transaction,
conn: socket
) )
push(socket, "pending_transaction", %{ push(socket, "pending_transaction", %{
@ -47,7 +48,8 @@ defmodule BlockScoutWeb.TransactionChannel do
View.render_to_string( View.render_to_string(
TransactionView, TransactionView,
"_tile.html", "_tile.html",
transaction: transaction transaction: transaction,
conn: socket
) )
push(socket, "transaction", %{ push(socket, "transaction", %{

@ -213,7 +213,7 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisor do
Logger.info( Logger.info(
"Index had to catch up.", "Index had to catch up.",
first_block_number: first_block_number, first_block_number: first_block_number,
last_block_number: 0, last_block_number: last_block_number,
missing_block_count: missing_block_count, missing_block_count: missing_block_count,
shrunk: shrunk shrunk: shrunk
) )
@ -236,7 +236,12 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisor do
def handle_info( def handle_info(
{ref, {ref,
%{first_block_number: first_block_number, missing_block_count: missing_block_count, shrunk: true = shrunk}}, %{
first_block_number: first_block_number,
missing_block_count: missing_block_count,
last_block_number: last_block_number,
shrunk: true = shrunk
}},
%__MODULE__{ %__MODULE__{
task: %Task{ref: ref} task: %Task{ref: ref}
} = state } = state
@ -247,7 +252,7 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisor do
Logger.info( Logger.info(
"Index had to catch up, but the sequence was shrunk to save memory, so retrying immediately.", "Index had to catch up, but the sequence was shrunk to save memory, so retrying immediately.",
first_block_number: first_block_number, first_block_number: first_block_number,
last_block_number: 0, last_block_number: last_block_number,
missing_block_count: missing_block_count, missing_block_count: missing_block_count,
shrunk: shrunk shrunk: shrunk
) )

Loading…
Cancel
Save