kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-06-18 03:38:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: patch proposal

Browse Source
This commit is contained in:
Ludo Galabru
2021-04-05 17:23:02 -04:00
parent 763bb53b22
commit 0da0797f71
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
View File

@@ -1305,6 +1305,8 @@ 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
@@ -1314,12 +1316,18 @@ 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 {
if canonical_burnchain_tip.block_height == canonical_sortition_tip.block_height
|| timeout > 30_000
{
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(),
@@ -1344,7 +1352,8 @@ impl BitcoinRegtestController {
return Err(BurnchainControllerError::CoordinatorClosed);
}
// yield some time
sleep_ms(100);
sleep_ms(step);
timeout += step;
}
}