@@ -2429,7 +2429,9 @@ fn miner_forking() {
2429
2429
|config| {
2430
2430
config. miner . block_commit_delay = Duration :: from_secs ( 0 ) ;
2431
2431
} ,
2432
- |_| { } ,
2432
+ |config| {
2433
+ config. miner . block_commit_delay = Duration :: from_secs ( 0 ) ;
2434
+ } ,
2433
2435
) ;
2434
2436
2435
2437
let ( conf_1, conf_2) = miners. get_node_configs ( ) ;
@@ -6319,7 +6321,17 @@ fn continue_after_fast_block_no_sortition() {
6319
6321
let num_signers = 5 ;
6320
6322
let num_txs = 1 ;
6321
6323
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
+ ) ;
6323
6335
let ( conf_1, _) = miners. get_node_configs ( ) ;
6324
6336
let ( miner_pkh_1, miner_pkh_2) = miners. get_miner_public_key_hashes ( ) ;
6325
6337
let ( _, miner_pk_2) = miners. get_miner_public_keys ( ) ;
@@ -7587,8 +7599,11 @@ fn tenure_extend_after_failed_miner() {
7587
7599
} ,
7588
7600
|config| {
7589
7601
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 ) ;
7590
7606
} ,
7591
- |_| { } ,
7592
7607
) ;
7593
7608
7594
7609
let ( conf_1, _) = miners. get_node_configs ( ) ;
@@ -7691,8 +7706,12 @@ fn tenure_extend_after_bad_commit() {
7691
7706
signer_config. block_proposal_timeout = block_proposal_timeout;
7692
7707
signer_config. first_proposal_burn_block_timing = first_proposal_burn_block_timing;
7693
7708
} ,
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
+ } ,
7696
7715
) ;
7697
7716
let rl1_skip_commit_op = miners
7698
7717
. signer_test
@@ -10050,8 +10069,12 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
10050
10069
signer_config. tenure_last_block_proposal_timeout = Duration :: from_secs ( 1800 ) ;
10051
10070
signer_config. first_proposal_burn_block_timing = Duration :: from_secs ( 1800 ) ;
10052
10071
} ,
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
+ } ,
10055
10078
) ;
10056
10079
let rl1_skip_commit_op = miners
10057
10080
. signer_test
@@ -10319,9 +10342,12 @@ fn interrupt_miner_on_new_stacks_tip() {
10319
10342
signer_config. first_proposal_burn_block_timing = Duration :: from_secs ( 60 ) ;
10320
10343
} ,
10321
10344
|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 ) ;
10323
10350
} ,
10324
- |_| { } ,
10325
10351
) ;
10326
10352
10327
10353
let skip_commit_op_rl1 = miners
@@ -10584,8 +10610,11 @@ fn prev_miner_extends_if_incoming_miner_fails_to_mine_success() {
10584
10610
} ,
10585
10611
|config| {
10586
10612
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 ) ;
10587
10617
} ,
10588
- |_| { } ,
10589
10618
) ;
10590
10619
10591
10620
let rl1_skip_commit_op = miners
@@ -10750,8 +10779,11 @@ fn prev_miner_extends_if_incoming_miner_fails_to_mine_failure() {
10750
10779
} ,
10751
10780
|config| {
10752
10781
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 ) ;
10753
10786
} ,
10754
- |_| { } ,
10755
10787
) ;
10756
10788
10757
10789
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() {
10947
10979
} ,
10948
10980
|config| {
10949
10981
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 ) ;
10950
10986
} ,
10951
- |_| { } ,
10952
10987
) ;
10953
10988
10954
10989
let ( conf_1, _) = miners. get_node_configs ( ) ;
@@ -11107,8 +11142,11 @@ fn non_blocking_minority_configured_to_favour_incoming_miner() {
11107
11142
} ,
11108
11143
|config| {
11109
11144
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 ) ;
11110
11149
} ,
11111
- |_| { } ,
11112
11150
) ;
11113
11151
11114
11152
let ( conf_1, _) = miners. get_node_configs ( ) ;
@@ -11334,8 +11372,11 @@ fn non_blocking_minority_configured_to_favour_prev_miner() {
11334
11372
} ,
11335
11373
|config| {
11336
11374
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 ) ;
11337
11379
} ,
11338
- |_| { } ,
11339
11380
) ;
11340
11381
11341
11382
let ( conf_1, _) = miners. get_node_configs ( ) ;
@@ -11544,8 +11585,12 @@ fn mark_miner_as_invalid_if_reorg_is_rejected() {
11544
11585
signer_config. first_proposal_burn_block_timing = Duration :: from_secs ( 0 ) ;
11545
11586
}
11546
11587
} ,
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
+ } ,
11549
11594
) ;
11550
11595
let all_signers = miners
11551
11596
. signer_test
0 commit comments