test: remove unsused mutable from test utils (phase 2), #6104

fdefelici · fdefelici · commit 4e2a5ac8dddb · 2025-05-12T18:18:56.000+02:00
diff --git a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
@@ -2121,7 +2121,7 @@ impl BitcoinRegtestController {
     /// Produce `num_blocks` regtest bitcoin blocks, sending the bitcoin coinbase rewards
     ///  to the bitcoin single sig addresses corresponding to `pks` in a round robin fashion.
     #[cfg(test)]
-    pub fn bootstrap_chain_to_pks(&mut self, num_blocks: usize, pks: &[Secp256k1PublicKey]) {
+    pub fn bootstrap_chain_to_pks(&self, num_blocks: usize, pks: &[Secp256k1PublicKey]) {
         info!("Creating wallet if it does not exist");
         if let Err(e) = self.create_wallet_if_dne() {
             error!("Error when creating wallet: {e:?}");
diff --git a/testnet/stacks-node/src/tests/nakamoto_integrations.rs b/testnet/stacks-node/src/tests/nakamoto_integrations.rs
@@ -750,7 +750,7 @@ pub fn next_block_and_mine_commit(
 /// Mine a bitcoin block, and wait until a block-commit has been issued, **or** a timeout occurs
 /// (timeout_secs)
 pub fn next_block_and_commits_only(
-    btc_controller: &mut BitcoinRegtestController,
+    btc_controller: &BitcoinRegtestController,
     timeout_secs: u64,
     node_conf: &Config,
     node_counters: &Counters,
@@ -1234,7 +1234,7 @@ pub fn setup_epoch_3_reward_set(
     blocks_processed: &Arc<AtomicU64>,
     stacker_sks: &[StacksPrivateKey],
     signer_sks: &[StacksPrivateKey],
-    btc_regtest_controller: &mut BitcoinRegtestController,
+    btc_regtest_controller: &BitcoinRegtestController,
     num_stacking_cycles: Option<u64>,
 ) {
     assert_eq!(stacker_sks.len(), signer_sks.len());
@@ -1326,7 +1326,7 @@ pub fn boot_to_epoch_3_reward_set_calculation_boundary(
     blocks_processed: &Arc<AtomicU64>,
     stacker_sks: &[StacksPrivateKey],
     signer_sks: &[StacksPrivateKey],
-    btc_regtest_controller: &mut BitcoinRegtestController,
+    btc_regtest_controller: &BitcoinRegtestController,
     num_stacking_cycles: Option<u64>,
 ) {
     setup_epoch_3_reward_set(
@@ -1371,7 +1371,7 @@ pub fn boot_to_epoch_3_reward_set_calculation_boundary(
 pub fn boot_to_epoch_25(
     naka_conf: &Config,
     blocks_processed: &Arc<AtomicU64>,
-    btc_regtest_controller: &mut BitcoinRegtestController,
+    btc_regtest_controller: &BitcoinRegtestController,
 ) {
     let epochs = naka_conf.burnchain.epochs.clone().unwrap();
     let epoch_25 = &epochs[StacksEpochId::Epoch25];
@@ -1414,7 +1414,7 @@ pub fn boot_to_epoch_3_reward_set(
     blocks_processed: &Arc<AtomicU64>,
     stacker_sks: &[StacksPrivateKey],
     signer_sks: &[StacksPrivateKey],
-    btc_regtest_controller: &mut BitcoinRegtestController,
+    btc_regtest_controller: &BitcoinRegtestController,
     num_stacking_cycles: Option<u64>,
 ) {
     boot_to_epoch_3_reward_set_calculation_boundary(
diff --git a/testnet/stacks-node/src/tests/signer/mod.rs b/testnet/stacks-node/src/tests/signer/mod.rs
@@ -233,7 +233,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
         }
     }
 
-    pub fn wait_for_registered(&mut self) {
+    pub fn wait_for_registered(&self) {
         let mut finished_signers = HashSet::new();
         wait_for(120, || {
             self.send_status_request(&finished_signers);
@@ -253,7 +253,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     }
 
     /// Send a status request to the signers to ensure they are registered for both reward cycles.
-    pub fn wait_for_registered_both_reward_cycles(&mut self) {
+    pub fn wait_for_registered_both_reward_cycles(&self) {
         let mut finished_signers = HashSet::new();
         wait_for(120, || {
             self.send_status_request(&finished_signers);
@@ -279,7 +279,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
         .expect("Timed out while waiting for the signers to be registered for both reward cycles");
     }
 
-    pub fn wait_for_cycle(&mut self, timeout_secs: u64, reward_cycle: u64) {
+    pub fn wait_for_cycle(&self, timeout_secs: u64, reward_cycle: u64) {
         let mut finished_signers = HashSet::new();
         wait_for(timeout_secs, || {
             self.send_status_request(&finished_signers);
@@ -299,9 +299,9 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
         }).unwrap();
     }
 
-    pub fn mine_bitcoin_block(&mut self) {
+    pub fn mine_bitcoin_block(&self) {
         let info = self.get_peer_info();
-        next_block_and(&mut self.running_nodes.btc_regtest_controller, 60, || {
+        next_block_and(&self.running_nodes.btc_regtest_controller, 60, || {
             Ok(get_chain_info(&self.running_nodes.conf).burn_block_height > info.burn_block_height)
         })
         .unwrap();
@@ -314,7 +314,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     ///    1. Having a valid sortition
     ///    2. The active miner is the winner of that sortition
     ///    3. The active miner is building off of the prior tenure
-    pub fn check_signer_states_normal(&mut self) {
+    pub fn check_signer_states_normal(&self) {
         let (state_machines, info_cur) = self.get_burn_updated_states();
 
         let sortition_latest =
@@ -375,7 +375,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     ///  latest burn block:
     ///    1. Having an invalid miner
     ///    2. The active miner is the winner of the prior sortition
-    pub fn check_signer_states_revert_to_prior(&mut self) {
+    pub fn check_signer_states_revert_to_prior(&self) {
         let (state_machines, info_cur) = self.get_burn_updated_states();
 
         let sortition_latest =
@@ -431,7 +431,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
 
     /// Submit a stacks transfer just to trigger block production
     pub fn submit_transfer_tx(
-        &mut self,
+        &self,
         sender_sk: &StacksPrivateKey,
         send_fee: u64,
         send_amt: u64,
@@ -454,7 +454,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     /// Submit a burn block dependent contract for publishing
     ///  and wait until it is included in a block
     pub fn submit_burn_block_contract_and_wait(
-        &mut self,
+        &self,
         sender_sk: &StacksPrivateKey,
     ) -> Result<String, String> {
         let http_origin = format!("http://{}", &self.running_nodes.conf.node.rpc_bind);
@@ -485,7 +485,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     /// Submit a burn block dependent contract-call
     ///  and wait until it is included in a block
     pub fn submit_burn_block_call_and_wait(
-        &mut self,
+        &self,
         sender_sk: &StacksPrivateKey,
     ) -> Result<String, String> {
         let http_origin = format!("http://{}", &self.running_nodes.conf.node.rpc_bind);
@@ -582,7 +582,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     ///    1. Not having a sortition!
     ///    2. The active miner is the winner of the last sortition
     ///    3. The active miner is building off of the prior tenure
-    pub fn check_signer_states_normal_missed_sortition(&mut self) {
+    pub fn check_signer_states_normal_missed_sortition(&self) {
         let (state_machines, info_cur) = self.get_burn_updated_states();
         let non_sortition_latest =
             get_sortition_info_ch(&self.running_nodes.conf, &info_cur.pox_consensus);
@@ -653,7 +653,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     ///    2. The active miner is the winner of that sortition
     ///    3. The active miner is building off of the prior tenure
     pub fn check_signer_states_reorg(
-        &mut self,
+        &self,
         accepting_reorg: &[StacksPublicKey],
         rejecting_reorg: &[StacksPublicKey],
     ) {
@@ -841,15 +841,15 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     }
 
     fn mine_block_wait_on_processing(
-        &mut self,
+        &self,
         node_confs: &[&NeonConfig],
         node_counters: &[&Counters],
         timeout: Duration,
     ) {
         let blocks_len = test_observer::get_blocks().len();
         let mined_block_time = Instant::now();
         next_block_and_wait_for_commits(
-            &mut self.running_nodes.btc_regtest_controller,
+            &self.running_nodes.btc_regtest_controller,
             timeout.as_secs(),
             node_confs,
             node_counters,
@@ -872,7 +872,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     /// Chain information is captured before `f` is called, and then again after `f`
     /// to ensure that the block was mined.
     /// Note: this function does _not_ mine a BTC block.
-    fn wait_for_nakamoto_block(&mut self, timeout_secs: u64, f: impl FnOnce() -> ()) {
+    fn wait_for_nakamoto_block(&self, timeout_secs: u64, f: impl FnOnce() -> ()) {
         let blocks_before = self.running_nodes.counters.naka_mined_blocks.get();
         let info_before = self.get_peer_info();
 
@@ -891,7 +891,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     /// Wait for a confirmed block and return a list of individual
     /// signer signatures
     fn wait_for_confirmed_block_v0(
-        &mut self,
+        &self,
         block_signer_sighash: &Sha512Trunc256Sum,
         timeout: Duration,
     ) -> Vec<MessageSignature> {
@@ -911,7 +911,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     /// Wait for a confirmed block and return a list of individual
     /// signer signatures
     fn wait_for_confirmed_block_with_hash(
-        &mut self,
+        &self,
         block_signer_sighash: &Sha512Trunc256Sum,
         timeout: Duration,
     ) -> serde_json::Map<String, serde_json::Value> {
@@ -938,7 +938,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
         panic!("Timed out while waiting for confirmation of block with signer sighash = {block_signer_sighash}")
     }
 
-    fn wait_for_validate_ok_response(&mut self, timeout: Duration) -> BlockValidateOk {
+    fn wait_for_validate_ok_response(&self, timeout: Duration) -> BlockValidateOk {
         // Wait for the block to show up in the test observer
         let t_start = Instant::now();
         loop {
@@ -958,7 +958,7 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     }
 
     fn wait_for_validate_reject_response(
-        &mut self,
+        &self,
         timeout: Duration,
         signer_signature_hash: Sha512Trunc256Sum,
     ) -> BlockValidateReject {
@@ -983,14 +983,14 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
     }
 
     // Must be called AFTER booting the chainstate
-    fn run_until_epoch_3_boundary(&mut self) {
+    fn run_until_epoch_3_boundary(&self) {
         let epochs = self.running_nodes.conf.burnchain.epochs.clone().unwrap();
         let epoch_3 = &epochs[StacksEpochId::Epoch30];
 
         let epoch_30_boundary = epoch_3.start_height - 1;
         // advance to epoch 3.0 and trigger a sign round (cannot vote on blocks in pre epoch 3.0)
         run_until_burnchain_height(
-            &mut self.running_nodes.btc_regtest_controller,
+            &self.running_nodes.btc_regtest_controller,
             &self.running_nodes.counters.blocks_processed,
             epoch_30_boundary,
             &self.running_nodes.conf,
diff --git a/testnet/stacks-node/src/tests/signer/v0.rs b/testnet/stacks-node/src/tests/signer/v0.rs
