@@ -1810,6 +1810,8 @@ pub struct NodeConfig {
1810
1810
pub miner : bool ,
1811
1811
pub stacker : bool ,
1812
1812
pub mock_mining : bool ,
1813
+ /// Where to output blocks from mock mining
1814
+ pub mock_mining_output_dir : Option < PathBuf > ,
1813
1815
pub mine_microblocks : bool ,
1814
1816
pub microblock_frequency : u64 ,
1815
1817
pub max_microblocks : u64 ,
@@ -2102,6 +2104,7 @@ impl Default for NodeConfig {
2102
2104
miner : false ,
2103
2105
stacker : false ,
2104
2106
mock_mining : false ,
2107
+ mock_mining_output_dir : None ,
2105
2108
mine_microblocks : true ,
2106
2109
microblock_frequency : 30_000 ,
2107
2110
max_microblocks : u16:: MAX as u64 ,
@@ -2164,7 +2167,7 @@ impl NodeConfig {
2164
2167
) -> Neighbor {
2165
2168
Neighbor {
2166
2169
addr : NeighborKey {
2167
- peer_version : peer_version ,
2170
+ peer_version,
2168
2171
network_id : chain_id,
2169
2172
addrbytes : PeerAddress :: from_socketaddr ( & addr) ,
2170
2173
port : addr. port ( ) ,
@@ -2556,6 +2559,7 @@ pub struct NodeConfigFile {
2556
2559
pub miner : Option < bool > ,
2557
2560
pub stacker : Option < bool > ,
2558
2561
pub mock_mining : Option < bool > ,
2562
+ pub mock_mining_output_dir : Option < String > ,
2559
2563
pub mine_microblocks : Option < bool > ,
2560
2564
pub microblock_frequency : Option < u64 > ,
2561
2565
pub max_microblocks : Option < u64 > ,
@@ -2595,10 +2599,9 @@ impl NodeConfigFile {
2595
2599
p2p_address : self . p2p_address . unwrap_or ( rpc_bind. clone ( ) ) ,
2596
2600
bootstrap_node : vec ! [ ] ,
2597
2601
deny_nodes : vec ! [ ] ,
2598
- data_url : match self . data_url {
2599
- Some ( data_url) => data_url,
2600
- None => format ! ( "http://{}" , rpc_bind) ,
2601
- } ,
2602
+ data_url : self
2603
+ . data_url
2604
+ . unwrap_or_else ( || format ! ( "http://{rpc_bind}" ) ) ,
2602
2605
local_peer_seed : match self . local_peer_seed {
2603
2606
Some ( seed) => hex_bytes ( & seed)
2604
2607
. map_err ( |_e| format ! ( "node.local_peer_seed should be a hex encoded string" ) ) ?,
@@ -2607,6 +2610,14 @@ impl NodeConfigFile {
2607
2610
miner,
2608
2611
stacker,
2609
2612
mock_mining : self . mock_mining . unwrap_or ( default_node_config. mock_mining ) ,
2613
+ mock_mining_output_dir : self
2614
+ . mock_mining_output_dir
2615
+ . map ( PathBuf :: from)
2616
+ . map ( fs:: canonicalize)
2617
+ . transpose ( )
2618
+ . unwrap_or_else ( |e| {
2619
+ panic ! ( "Failed to construct PathBuf from node.mock_mining_output_dir: {e}" )
2620
+ } ) ,
2610
2621
mine_microblocks : self
2611
2622
. mine_microblocks
2612
2623
. unwrap_or ( default_node_config. mine_microblocks ) ,
0 commit comments