@@ -84,7 +84,8 @@ use crate::tests::nakamoto_integrations::{
84
84
POX_4_DEFAULT_STACKER_BALANCE , POX_4_DEFAULT_STACKER_STX_AMT ,
85
85
} ;
86
86
use crate :: tests:: neon_integrations:: {
87
- get_account, get_chain_info, get_chain_info_opt, get_sortition_info, get_sortition_info_ch, next_block_and_wait, run_until_burnchain_height, submit_tx, submit_tx_fallible, test_observer
87
+ get_account, get_chain_info, get_chain_info_opt, get_sortition_info, get_sortition_info_ch,
88
+ next_block_and_wait, run_until_burnchain_height, submit_tx, submit_tx_fallible, test_observer,
88
89
} ;
89
90
use crate :: tests:: {
90
91
self , gen_random_port, make_contract_call, make_contract_publish, make_stacks_transfer,
@@ -11446,18 +11447,20 @@ fn multiple_miners_empty_sortition() {
11446
11447
. unwrap ( ) ;
11447
11448
}
11448
11449
11449
-
11450
11450
let last_active_sortition = get_sortition_info ( & conf) ;
11451
11451
assert ! ( last_active_sortition. was_sortition) ;
11452
11452
11453
11453
// lets mine a btc flash block
11454
11454
let rl2_commits_before = rl2_commits. load ( Ordering :: SeqCst ) ;
11455
11455
let rl1_commits_before = rl1_commits. load ( Ordering :: SeqCst ) ;
11456
- signer_test. running_nodes . btc_regtest_controller . build_next_block ( 2 ) ;
11456
+ signer_test
11457
+ . running_nodes
11458
+ . btc_regtest_controller
11459
+ . build_next_block ( 2 ) ;
11457
11460
11458
11461
wait_for ( 60 , || {
11459
- Ok ( rl2_commits. load ( Ordering :: SeqCst ) > rl2_commits_before &&
11460
- rl1_commits. load ( Ordering :: SeqCst ) > rl1_commits_before)
11462
+ Ok ( rl2_commits. load ( Ordering :: SeqCst ) > rl2_commits_before
11463
+ && rl1_commits. load ( Ordering :: SeqCst ) > rl1_commits_before)
11461
11464
} )
11462
11465
. unwrap ( ) ;
11463
11466
@@ -11520,13 +11523,11 @@ fn multiple_miners_empty_sortition() {
11520
11523
"The last two transactions after the flash block must be included in a block"
11521
11524
) ;
11522
11525
11523
-
11524
11526
rl2_coord_channels
11525
11527
. lock ( )
11526
11528
. expect ( "Mutex poisoned" )
11527
11529
. stop_chains_coordinator ( ) ;
11528
11530
run_loop_stopper_2. store ( false , Ordering :: SeqCst ) ;
11529
11531
run_loop_2_thread. join ( ) . unwrap ( ) ;
11530
11532
signer_test. shutdown ( ) ;
11531
-
11532
11533
}
0 commit comments