kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-06-15 09:07:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into fix/miner-rewards-events

Browse Source
This commit is contained in:
Matthew Little
2022-11-02 19:03:35 +01:00
committed by GitHub
parent 2e70ea67ca 3931e6b0bf
commit fb95ef66d2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
View File

@@ -333,7 +333,7 @@ impl BitcoinRegtestController {
/// Get the default Burnchain instance from our config
fn default_burnchain(&self) -> Burnchain {
let (network_name, _network_type) = self.config.burnchain.get_bitcoin_network();
match &self.burnchain_config {
let mut burnchain = match &self.burnchain_config {
Some(burnchain) => burnchain.clone(),
None => {
let working_dir = self.config.get_burn_db_path();
@@ -345,7 +345,10 @@ impl BitcoinRegtestController {
}
}
}
}
};
self.config
.update_pox_constants(&mut burnchain.pox_constants);
burnchain
}
/// Get the PoX constants in use