wait till peer_count is equal to 1 (nodes are connected after reorg)

priv/cabbage/apps/itest/lib/poller.ex

@@ -83,6 +83,29 @@ defmodule Itest.Poller do
   def wait_on_receipt_confirmed(receipt_hash),
     do: wait_on_receipt_status(receipt_hash, "0x1", @retry_count)
 
+  @doc """
+  Waits until the node has the required peers nubmer.
+  """
+  def wait_until_peer_count(peer_count) do
+    case Ethereumex.HttpClient.net_peer_count() do
+      {:ok, "0x" <> number_hex} ->
+        {count, ""} = Integer.parse(number_hex, 16)
+
+        IO.inspect(count)
+
+        if count >= peer_count do
+          :ok
+        else
+          Process.sleep(2_000)
+          wait_until_peer_count(peer_count)
+        end
+
+      _other ->
+        Process.sleep(2_000)
+        wait_until_peer_count(peer_count)
+    end
+  end
+
   @doc """
   API:: Pull until the utxo is not found for the address.
   """

priv/cabbage/apps/itest/lib/reorg.ex

@@ -23,7 +23,6 @@ defmodule Itest.Reorg do
 
   @node1 "geth-1"
   @node2 "geth-2"
-  @pause_seconds 100
 
   @rpc_nodes ["http://localhost:9000", "http://localhost:9001"]
 
@@ -34,21 +33,18 @@ defmodule Itest.Reorg do
 
       func.()
 
-      Process.sleep(@pause_seconds * 1000)
+      Process.sleep(20 * 1000)
 
       pause_container!(@node2)
       unpause_container!(@node1)
 
       response = func.()
 
-      # the second sleep is shorter so the number of generated blocks is smaller
-      Process.sleep(floor(@pause_seconds / 5) * 1000)
-
       unpause_container!(@node2)
       unpause_container!(@node1)
 
-      # wait for reorg
-      Process.sleep(30 * 1000)
+      Poller.wait_until_peer_count(1)
+      Process.sleep(30_000)
 
       response
     else