Skip to content

Commit d8d3337

Browse files
committed
chore: Add mock_mining_output_dir to node config
1 parent 3a81438 commit d8d3337

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

testnet/stacks-node/src/config.rs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,6 +1810,8 @@ pub struct NodeConfig {
18101810
pub miner: bool,
18111811
pub stacker: bool,
18121812
pub mock_mining: bool,
1813+
/// Where to output blocks from mock mining
1814+
pub mock_mining_output_dir: Option<PathBuf>,
18131815
pub mine_microblocks: bool,
18141816
pub microblock_frequency: u64,
18151817
pub max_microblocks: u64,
@@ -2102,6 +2104,7 @@ impl Default for NodeConfig {
21022104
miner: false,
21032105
stacker: false,
21042106
mock_mining: false,
2107+
mock_mining_output_dir: None,
21052108
mine_microblocks: true,
21062109
microblock_frequency: 30_000,
21072110
max_microblocks: u16::MAX as u64,
@@ -2164,7 +2167,7 @@ impl NodeConfig {
21642167
) -> Neighbor {
21652168
Neighbor {
21662169
addr: NeighborKey {
2167-
peer_version: peer_version,
2170+
peer_version,
21682171
network_id: chain_id,
21692172
addrbytes: PeerAddress::from_socketaddr(&addr),
21702173
port: addr.port(),
@@ -2556,6 +2559,7 @@ pub struct NodeConfigFile {
25562559
pub miner: Option<bool>,
25572560
pub stacker: Option<bool>,
25582561
pub mock_mining: Option<bool>,
2562+
pub mock_mining_output_dir: Option<String>,
25592563
pub mine_microblocks: Option<bool>,
25602564
pub microblock_frequency: Option<u64>,
25612565
pub max_microblocks: Option<u64>,
@@ -2595,10 +2599,9 @@ impl NodeConfigFile {
25952599
p2p_address: self.p2p_address.unwrap_or(rpc_bind.clone()),
25962600
bootstrap_node: vec![],
25972601
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}")),
26022605
local_peer_seed: match self.local_peer_seed {
26032606
Some(seed) => hex_bytes(&seed)
26042607
.map_err(|_e| format!("node.local_peer_seed should be a hex encoded string"))?,
@@ -2607,6 +2610,14 @@ impl NodeConfigFile {
26072610
miner,
26082611
stacker,
26092612
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+
}),
26102621
mine_microblocks: self
26112622
.mine_microblocks
26122623
.unwrap_or(default_node_config.mine_microblocks),

0 commit comments

Comments
 (0)