Skip to content

Commit fa80e0a

Browse files
committed
test: fix conflict in test after merge
1 parent 612dc5d commit fa80e0a

File tree

1 file changed

+2
-2
lines changed
  • testnet/stacks-node/src/tests/signer

1 file changed

+2
-2
lines changed

testnet/stacks-node/src/tests/signer/v0.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11747,7 +11747,7 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
1174711747
rl2_skip_commit_op.set(true);
1174811748

1174911749
info!("------------------------- Pause Miner 2's Block Mining -------------------------");
11750-
TEST_MINE_STALL.lock().unwrap().replace(true);
11750+
TEST_MINE_STALL.set(true);
1175111751

1175211752
let burn_height_before = get_chain_info(&signer_test.running_nodes.conf).burn_block_height;
1175311753

@@ -11789,7 +11789,7 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
1178911789
let info_before = get_chain_info(&conf);
1179011790
let mined_before = test_observer::get_blocks().len();
1179111791

11792-
TEST_MINE_STALL.lock().unwrap().replace(false);
11792+
TEST_MINE_STALL.set(false);
1179311793

1179411794
wait_for(30, || {
1179511795
Ok(signer_test

0 commit comments

Comments
 (0)