Skip to content

Commit e078628

Browse files
committed
test: set block_commit_delay = 0 in tests that use submit_commit_miner_X
1 parent 2460984 commit e078628

File tree

1 file changed

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

1 file changed

+61
-16
lines changed

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

Lines changed: 61 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2429,7 +2429,9 @@ fn miner_forking() {
24292429
|config| {
24302430
config.miner.block_commit_delay = Duration::from_secs(0);
24312431
},
2432-
|_| {},
2432+
|config| {
2433+
config.miner.block_commit_delay = Duration::from_secs(0);
2434+
},
24332435
);
24342436

24352437
let (conf_1, conf_2) = miners.get_node_configs();
@@ -6319,7 +6321,17 @@ fn continue_after_fast_block_no_sortition() {
63196321
let num_signers = 5;
63206322
let num_txs = 1;
63216323

6322-
let mut miners = MultipleMinerTest::new(num_signers, num_txs);
6324+
let mut miners = MultipleMinerTest::new_with_config_modifications(
6325+
num_signers,
6326+
num_txs,
6327+
|_| {},
6328+
|config| {
6329+
config.miner.block_commit_delay = Duration::from_secs(0);
6330+
},
6331+
|config| {
6332+
config.miner.block_commit_delay = Duration::from_secs(0);
6333+
},
6334+
);
63236335
let (conf_1, _) = miners.get_node_configs();
63246336
let (miner_pkh_1, miner_pkh_2) = miners.get_miner_public_key_hashes();
63256337
let (_, miner_pk_2) = miners.get_miner_public_keys();
@@ -7587,8 +7599,11 @@ fn tenure_extend_after_failed_miner() {
75877599
},
75887600
|config| {
75897601
config.miner.tenure_extend_wait_timeout = tenure_extend_wait_timeout;
7602+
config.miner.block_commit_delay = Duration::from_secs(0);
7603+
},
7604+
|config| {
7605+
config.miner.block_commit_delay = Duration::from_secs(0);
75907606
},
7591-
|_| {},
75927607
);
75937608

75947609
let (conf_1, _) = miners.get_node_configs();
@@ -7691,8 +7706,12 @@ fn tenure_extend_after_bad_commit() {
76917706
signer_config.block_proposal_timeout = block_proposal_timeout;
76927707
signer_config.first_proposal_burn_block_timing = first_proposal_burn_block_timing;
76937708
},
7694-
|_| {},
7695-
|_| {},
7709+
|config| {
7710+
config.miner.block_commit_delay = Duration::from_secs(0);
7711+
},
7712+
|config| {
7713+
config.miner.block_commit_delay = Duration::from_secs(0);
7714+
},
76967715
);
76977716
let rl1_skip_commit_op = miners
76987717
.signer_test
@@ -10050,8 +10069,12 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
1005010069
signer_config.tenure_last_block_proposal_timeout = Duration::from_secs(1800);
1005110070
signer_config.first_proposal_burn_block_timing = Duration::from_secs(1800);
1005210071
},
10053-
|_| {},
10054-
|_| {},
10072+
|config| {
10073+
config.miner.block_commit_delay = Duration::from_secs(0);
10074+
},
10075+
|config| {
10076+
config.miner.block_commit_delay = Duration::from_secs(0);
10077+
},
1005510078
);
1005610079
let rl1_skip_commit_op = miners
1005710080
.signer_test
@@ -10319,9 +10342,12 @@ fn interrupt_miner_on_new_stacks_tip() {
1031910342
signer_config.first_proposal_burn_block_timing = Duration::from_secs(60);
1032010343
},
1032110344
|config| {
10322-
config.miner.block_rejection_timeout_steps = [(0, Duration::from_secs(1200))].into()
10345+
config.miner.block_rejection_timeout_steps = [(0, Duration::from_secs(1200))].into();
10346+
config.miner.block_commit_delay = Duration::from_secs(0);
10347+
},
10348+
|config| {
10349+
config.miner.block_commit_delay = Duration::from_secs(0);
1032310350
},
10324-
|_| {},
1032510351
);
1032610352

1032710353
let skip_commit_op_rl1 = miners
@@ -10584,8 +10610,11 @@ fn prev_miner_extends_if_incoming_miner_fails_to_mine_success() {
1058410610
},
1058510611
|config| {
1058610612
config.miner.tenure_extend_wait_timeout = tenure_extend_wait_timeout;
10613+
config.miner.block_commit_delay = Duration::from_secs(0);
10614+
},
10615+
|config| {
10616+
config.miner.block_commit_delay = Duration::from_secs(0);
1058710617
},
10588-
|_| {},
1058910618
);
1059010619

1059110620
let rl1_skip_commit_op = miners
@@ -10750,8 +10779,11 @@ fn prev_miner_extends_if_incoming_miner_fails_to_mine_failure() {
1075010779
},
1075110780
|config| {
1075210781
config.miner.tenure_extend_wait_timeout = tenure_extend_wait_timeout;
10782+
config.miner.block_commit_delay = Duration::from_secs(0);
10783+
},
10784+
|config| {
10785+
config.miner.block_commit_delay = Duration::from_secs(0);
1075310786
},
10754-
|_| {},
1075510787
);
1075610788

1075710789
let (conf_1, _) = miners.get_node_configs();
@@ -10947,8 +10979,11 @@ fn prev_miner_will_not_attempt_to_extend_if_incoming_miner_produces_a_block() {
1094710979
},
1094810980
|config| {
1094910981
config.miner.tenure_extend_wait_timeout = tenure_extend_wait_timeout;
10982+
config.miner.block_commit_delay = Duration::from_secs(0);
10983+
},
10984+
|config| {
10985+
config.miner.block_commit_delay = Duration::from_secs(0);
1095010986
},
10951-
|_| {},
1095210987
);
1095310988

1095410989
let (conf_1, _) = miners.get_node_configs();
@@ -11107,8 +11142,11 @@ fn non_blocking_minority_configured_to_favour_incoming_miner() {
1110711142
},
1110811143
|config| {
1110911144
config.miner.tenure_extend_wait_timeout = tenure_extend_wait_timeout;
11145+
config.miner.block_commit_delay = Duration::from_secs(0);
11146+
},
11147+
|config| {
11148+
config.miner.block_commit_delay = Duration::from_secs(0);
1111011149
},
11111-
|_| {},
1111211150
);
1111311151

1111411152
let (conf_1, _) = miners.get_node_configs();
@@ -11334,8 +11372,11 @@ fn non_blocking_minority_configured_to_favour_prev_miner() {
1133411372
},
1133511373
|config| {
1133611374
config.miner.tenure_extend_wait_timeout = tenure_extend_wait_timeout;
11375+
config.miner.block_commit_delay = Duration::from_secs(0);
11376+
},
11377+
|config| {
11378+
config.miner.block_commit_delay = Duration::from_secs(0);
1133711379
},
11338-
|_| {},
1133911380
);
1134011381

1134111382
let (conf_1, _) = miners.get_node_configs();
@@ -11544,8 +11585,12 @@ fn mark_miner_as_invalid_if_reorg_is_rejected() {
1154411585
signer_config.first_proposal_burn_block_timing = Duration::from_secs(0);
1154511586
}
1154611587
},
11547-
|_| {},
11548-
|_| {},
11588+
|config| {
11589+
config.miner.block_commit_delay = Duration::from_secs(0);
11590+
},
11591+
|config| {
11592+
config.miner.block_commit_delay = Duration::from_secs(0);
11593+
},
1154911594
);
1155011595
let all_signers = miners
1155111596
.signer_test

0 commit comments

Comments
 (0)