From cee1d9cc9581547898a3601f17032084641e1e27 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Wed, 2 Nov 2022 13:10:54 +0100 Subject: [PATCH 1/2] fix: regression with pox_2_activation config --- .../src/burnchains/bitcoin_regtest_controller.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs index 76740a373..3d9f4cd4e 100644 --- a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs +++ b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs @@ -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,9 @@ impl BitcoinRegtestController { } } } - } + }; + self.config.update_pox_constants(&mut burnchain.pox_constants); + burnchain } /// Get the PoX constants in use From e5d10c87e35ae00da3c94f4266e078ba6d6354bd Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Wed, 2 Nov 2022 13:33:56 +0100 Subject: [PATCH 2/2] ci: lint fix --- .../stacks-node/src/burnchains/bitcoin_regtest_controller.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs index 3d9f4cd4e..2015a2115 100644 --- a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs +++ b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs @@ -346,7 +346,8 @@ impl BitcoinRegtestController { } } }; - self.config.update_pox_constants(&mut burnchain.pox_constants); + self.config + .update_pox_constants(&mut burnchain.pox_constants); burnchain }