@@ -390,10 +390,8 @@ pub fn command_try_mine(argv: &[String], conf: Option<&Config>) {
390
390
eprintln ! ( "" ) ;
391
391
eprintln ! ( "Given a <working-dir>, try to ''mine'' an anchored block. This invokes the miner block" ) ;
392
392
eprintln ! ( "assembly, but does not attempt to broadcast a block commit. This is useful for determining" ) ;
393
- eprintln ! (
394
- "what transactions a given chain state would include in an anchor block, or otherwise"
395
- ) ;
396
- eprintln ! ( "simulating a miner." ) ;
393
+ eprintln ! ( "what transactions a given chain state would include in an anchor block," ) ;
394
+ eprintln ! ( "or otherwise simulating a miner." ) ;
397
395
process:: exit ( 1 ) ;
398
396
} ;
399
397
@@ -418,16 +416,16 @@ pub fn command_try_mine(argv: &[String], conf: Option<&Config>) {
418
416
419
417
let burnchain = conf. get_burnchain ( ) ;
420
418
let sort_db = SortitionDB :: open ( & sort_db_path, false , burnchain. pox_constants . clone ( ) )
421
- . unwrap_or_else ( |_ | panic ! ( "Failed to open {sort_db_path}" ) ) ;
419
+ . unwrap_or_else ( |e | panic ! ( "Failed to open {sort_db_path}: {e }" ) ) ;
422
420
let ( chain_state, _) = StacksChainState :: open (
423
421
conf. is_mainnet ( ) ,
424
422
conf. burnchain . chain_id ,
425
423
& chain_state_path,
426
424
None ,
427
425
)
428
- . expect ( "Failed to open stacks chain state" ) ;
426
+ . unwrap_or_else ( |e| panic ! ( "Failed to open stacks chain state: {e}" ) ) ;
429
427
let chain_tip = SortitionDB :: get_canonical_burn_chain_tip ( sort_db. conn ( ) )
430
- . expect ( "Failed to get sortition chain tip" ) ;
428
+ . unwrap_or_else ( |e| panic ! ( "Failed to get sortition chain tip: {e}" ) ) ;
431
429
432
430
let estimator = Box :: new ( UnitEstimator ) ;
433
431
let metric = Box :: new ( UnitMetric ) ;
@@ -439,7 +437,7 @@ pub fn command_try_mine(argv: &[String], conf: Option<&Config>) {
439
437
estimator,
440
438
metric,
441
439
)
442
- . expect ( "Failed to open mempool db" ) ;
440
+ . unwrap_or_else ( |e| panic ! ( "Failed to open mempool db: {e}" ) ) ;
443
441
444
442
let header_tip = NakamotoChainState :: get_canonical_block_header ( chain_state. db ( ) , & sort_db)
445
443
. unwrap ( )
@@ -449,7 +447,7 @@ pub fn command_try_mine(argv: &[String], conf: Option<&Config>) {
449
447
& header_tip. consensus_hash ,
450
448
& header_tip. anchored_header . block_hash ( ) ,
451
449
)
452
- . expect ( "Failed to load chain tip header info" )
450
+ . unwrap_or_else ( |e| panic ! ( "Failed to load chain tip header info: {e}" ) )
453
451
. expect ( "Failed to load chain tip header info" ) ;
454
452
455
453
let sk = StacksPrivateKey :: new ( ) ;
@@ -482,7 +480,12 @@ pub fn command_try_mine(argv: &[String], conf: Option<&Config>) {
482
480
& coinbase_tx,
483
481
settings,
484
482
None ,
485
- & Burnchain :: new ( & burnchain_path, "bitcoin" , "main" ) . unwrap ( ) ,
483
+ & Burnchain :: new (
484
+ & burnchain_path,
485
+ & burnchain. chain_name ,
486
+ & burnchain. network_name ,
487
+ )
488
+ . unwrap ( ) ,
486
489
) ;
487
490
488
491
let stop = get_epoch_time_ms ( ) ;
@@ -542,13 +545,13 @@ fn replay_staging_block(db_path: &str, index_block_hash_hex: &str, conf: Option<
542
545
. unwrap ( ) ;
543
546
544
547
let burnchain = conf. get_burnchain ( ) ;
545
- let epochs = conf. burnchain . epochs . as_ref ( ) . expect ( "No Epochs found" ) ;
548
+ let epochs = conf. burnchain . get_epoch_list ( ) ;
546
549
let mut sortdb = SortitionDB :: connect (
547
550
& sort_db_path,
548
551
burnchain. first_block_height ,
549
552
& burnchain. first_block_hash ,
550
553
u64:: from ( burnchain. first_block_timestamp ) ,
551
- epochs,
554
+ & epochs,
552
555
burnchain. pox_constants . clone ( ) ,
553
556
None ,
554
557
true ,
@@ -620,13 +623,13 @@ fn replay_mock_mined_block(db_path: &str, block: AssembledAnchorBlock, conf: Opt
620
623
. unwrap ( ) ;
621
624
622
625
let burnchain = conf. get_burnchain ( ) ;
623
- let epochs = conf. burnchain . epochs . as_ref ( ) . expect ( "No Epochs found" ) ;
626
+ let epochs = conf. burnchain . get_epoch_list ( ) ;
624
627
let mut sortdb = SortitionDB :: connect (
625
628
& sort_db_path,
626
629
burnchain. first_block_height ,
627
630
& burnchain. first_block_hash ,
628
631
u64:: from ( burnchain. first_block_timestamp ) ,
629
- epochs,
632
+ & epochs,
630
633
burnchain. pox_constants . clone ( ) ,
631
634
None ,
632
635
true ,
@@ -820,13 +823,13 @@ fn replay_naka_staging_block(db_path: &str, index_block_hash_hex: &str, conf: &C
820
823
. unwrap ( ) ;
821
824
822
825
let burnchain = conf. get_burnchain ( ) ;
823
- let epochs = conf. burnchain . epochs . as_ref ( ) . expect ( "No Epochs found" ) ;
826
+ let epochs = conf. burnchain . get_epoch_list ( ) ;
824
827
let mut sortdb = SortitionDB :: connect (
825
828
& sort_db_path,
826
829
burnchain. first_block_height ,
827
830
& burnchain. first_block_hash ,
828
831
u64:: from ( burnchain. first_block_timestamp ) ,
829
- epochs,
832
+ & epochs,
830
833
burnchain. pox_constants . clone ( ) ,
831
834
None ,
832
835
true ,
0 commit comments