From e09ebf2bc1d065f79efa207fa1526f8ce7e01498 Mon Sep 17 00:00:00 2001
From: Ludo Galabru <ludovic@blockstack.com>
Date: Tue, 6 Apr 2021 15:19:08 -0400
Subject: [PATCH] Revert "fix: patch proposal"

This reverts commit 0da0797f713cb1d10eb4ee3af10b98c1918e0d56.
---
 .../src/burnchains/bitcoin_regtest_controller.rs    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
index 7ca14116c..9aa382c30 100644
--- a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
+++ b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
@@ -1305,8 +1305,6 @@ impl BitcoinRegtestController {
         &self,
         height_to_wait: Option<u64>,
     ) -> Result<BurnchainTip, BurnchainControllerError> {
-        let mut timeout = 0;
-        let step = 100;
         loop {
             let canonical_burnchain_tip = self
                 .burnchain_db
@@ -1316,18 +1314,12 @@ impl BitcoinRegtestController {
                 .unwrap();
             let canonical_sortition_tip =
                 SortitionDB::get_canonical_burn_chain_tip(self.sortdb_ref().conn()).unwrap();
-
-            if canonical_burnchain_tip.block_height == canonical_sortition_tip.block_height
-                || timeout > 30_000
-            {
+            if canonical_burnchain_tip.block_height == canonical_sortition_tip.block_height {
                 let (_, state_transition) = self
                     .sortdb_ref()
                     .get_sortition_result(&canonical_sortition_tip.sortition_id)
                     .expect("Sortition DB error.")
                     .expect("BUG: no data for the canonical chain tip");
-                if timeout > 30_000 {
-                    error!("Aborting wait_for_sortitions");
-                }
                 return Ok(BurnchainTip {
                     block_snapshot: canonical_sortition_tip,
                     received_at: Instant::now(),
@@ -1352,8 +1344,7 @@ impl BitcoinRegtestController {
                 return Err(BurnchainControllerError::CoordinatorClosed);
             }
             // yield some time
-            sleep_ms(step);
-            timeout += step;
+            sleep_ms(100);
         }
     }