From f8f867a6bb72182602bcc629426d666243fbb42c Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 4 Mar 2019 13:34:06 +0100
Subject: [PATCH] Sync blocks after generating in mine_quorum()

---
 qa/rpc-tests/test_framework/test_framework.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index b6f354f138..e0d5fbdd84 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -498,36 +498,44 @@ class DashTestFramework(BitcoinTestFramework):
             set_mocktime(get_mocktime() + 1)
             set_node_times(self.nodes, get_mocktime())
             self.nodes[0].generate(skip_count)
+        sync_blocks(self.nodes)
 
         # Make sure all reached phase 1 (init)
         self.wait_for_quorum_phase(1, None, 0)
+        # Give nodes some time to connect to neighbors
+        sleep(2)
         set_mocktime(get_mocktime() + 1)
         set_node_times(self.nodes, get_mocktime())
         self.nodes[0].generate(2)
+        sync_blocks(self.nodes)
 
         # Make sure all reached phase 2 (contribute) and received all contributions
         self.wait_for_quorum_phase(2, "receivedContributions", expected_valid_count)
         set_mocktime(get_mocktime() + 1)
         set_node_times(self.nodes, get_mocktime())
         self.nodes[0].generate(2)
+        sync_blocks(self.nodes)
 
         # Make sure all reached phase 3 (complain) and received all complaints
         self.wait_for_quorum_phase(3, "receivedComplaints" if expected_valid_count != 10 else None, expected_valid_count)
         set_mocktime(get_mocktime() + 1)
         set_node_times(self.nodes, get_mocktime())
         self.nodes[0].generate(2)
+        sync_blocks(self.nodes)
 
         # Make sure all reached phase 4 (justify)
         self.wait_for_quorum_phase(4, None, 0)
         set_mocktime(get_mocktime() + 1)
         set_node_times(self.nodes, get_mocktime())
         self.nodes[0].generate(2)
+        sync_blocks(self.nodes)
 
         # Make sure all reached phase 5 (commit)
         self.wait_for_quorum_phase(5, "receivedPrematureCommitments", expected_valid_count)
         set_mocktime(get_mocktime() + 1)
         set_node_times(self.nodes, get_mocktime())
         self.nodes[0].generate(2)
+        sync_blocks(self.nodes)
 
         # Make sure all reached phase 6 (mining)
         self.wait_for_quorum_phase(6, None, 0)
@@ -544,6 +552,7 @@ class DashTestFramework(BitcoinTestFramework):
             set_mocktime(get_mocktime() + 1)
             set_node_times(self.nodes, get_mocktime())
             self.nodes[0].generate(1)
+            sync_blocks(self.nodes)
 
         sync_blocks(self.nodes)