Merge pull request #6026 from obycode/fix/mock-mining

fix: do not check for utxos when mock-mining

Author: kantai

testnet/stacks-node/src/run_loop/nakamoto.rs

@@ -166,6 +166,11 @@ impl RunLoop {
     /// If there's a network error, then assume that we're not a miner.
     fn check_is_miner(&mut self, burnchain: &mut BitcoinRegtestController) -> bool {
         if self.config.node.miner {
+            // If we are mock mining, then we don't need to check for UTXOs and
+            // we can just return true.
+            if self.config.get_node_config(false).mock_mining {
+                return true;
+            }
             let keychain = Keychain::default(self.config.node.seed.clone());
             let mut op_signer = keychain.generate_op_signer();
             if let Err(e) = burnchain.create_wallet_if_dne() {
@@ -206,10 +211,6 @@ impl RunLoop {
                         return true;
                     }
                 }
-                if self.config.get_node_config(false).mock_mining {
-                    info!("No UTXOs found, but configured to mock mine");
-                    return true;
-                }
                 thread::sleep(std::time::Duration::from_secs(Self::UTXO_RETRY_INTERVAL));
             }
             panic!("No UTXOs found, exiting");

testnet/stacks-node/src/run_loop/neon.rs

@@ -414,6 +414,11 @@ impl RunLoop {
     /// If there's a network error, then assume that we're not a miner.
     fn check_is_miner(&mut self, burnchain: &mut BitcoinRegtestController) -> bool {
         if self.config.node.miner {
+            // If we are mock mining, then we don't need to check for UTXOs and
+            // we can just return true.
+            if self.config.get_node_config(false).mock_mining {
+                return true;
+            }
             let keychain = Keychain::default(self.config.node.seed.clone());
             let mut op_signer = keychain.generate_op_signer();
             if let Err(e) = burnchain.create_wallet_if_dne() {
@@ -454,10 +459,6 @@ impl RunLoop {
                         return true;
                     }
                 }
-                if self.config.get_node_config(false).mock_mining {
-                    info!("No UTXOs found, but configured to mock mine");
-                    return true;
-                }
                 thread::sleep(std::time::Duration::from_secs(Self::UTXO_RETRY_INTERVAL));
             }
             panic!("No UTXOs found, exiting");