Merge pull request #2165 from poanetwork/ab-consider-uncles-when-calculating-block-time

sort blocks by timestamp when calculating average block time

CHANGELOG.md

@@ -6,6 +6,7 @@
 - [#2151](https://github.com/poanetwork/blockscout/pull/2151) - hide dropdown menu then other networks list is empty
 
 ### Fixes
+- [#2165](https://github.com/poanetwork/blockscout/pull/2165) - sort blocks by timestamp when calculating average block time
 - [#2175](https://github.com/poanetwork/blockscout/pull/2175) - fix coinmarketcap response errors
 - [#2164](https://github.com/poanetwork/blockscout/pull/2164) - fix large numbers in balance view card
 - [#2155](https://github.com/poanetwork/blockscout/pull/2155) - fix pending transaction query

apps/explorer/lib/explorer/counters/average_block_time.ex

@@ -66,7 +66,7 @@ defmodule Explorer.Counters.AverageBlockTime do
       from(block in Block,
         limit: 100,
         offset: 0,
-        order_by: [desc: block.number],
+        order_by: [desc: block.number, desc: block.timestamp],
         select: {block.number, block.timestamp}
       )
 

apps/explorer/test/explorer/counters/average_block_time_test.exs

@@ -3,7 +3,9 @@ defmodule Explorer.Counters.AverageBlockTimeTest do
 
   doctest Explorer.Counters.AverageBlockTimeDurationFormat
 
+  alias Explorer.Chain.Block
   alias Explorer.Counters.AverageBlockTime
+  alias Explorer.Repo
 
   setup do
     start_supervised!(AverageBlockTime)
@@ -24,5 +26,37 @@ defmodule Explorer.Counters.AverageBlockTimeTest do
     test "without blocks duration is 0" do
       assert AverageBlockTime.average_block_time() == Timex.Duration.parse!("PT0S")
     end
+
+    test "considers both uncles and consensus blocks" do
+      block_number = 99_999_999
+
+      first_timestamp = Timex.now()
+
+      insert(:block, number: block_number, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 3))
+      insert(:block, number: block_number, consensus: false, timestamp: Timex.shift(first_timestamp, seconds: 9))
+      insert(:block, number: block_number, consensus: false, timestamp: Timex.shift(first_timestamp, seconds: 6))
+
+      assert Repo.aggregate(Block, :count, :hash) == 3
+
+      AverageBlockTime.refresh()
+
+      assert AverageBlockTime.average_block_time() == Timex.Duration.parse!("PT3S")
+    end
+
+    test "when there are no uncles sorts by block number" do
+      block_number = 99_999_999
+
+      first_timestamp = Timex.now()
+
+      insert(:block, number: block_number, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 3))
+      insert(:block, number: block_number + 2, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 9))
+      insert(:block, number: block_number + 1, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 6))
+
+      assert Repo.aggregate(Block, :count, :hash) == 3
+
+      AverageBlockTime.refresh()
+
+      assert AverageBlockTime.average_block_time() == Timex.Duration.parse!("PT3S")
+    end
   end
 end