From 0fde36f125e729964cf340cbe8ea74a4ae32cd84 Mon Sep 17 00:00:00 2001
From: Pavitthra Pandurangan <paviusa23@gmail.com>
Date: Wed, 14 Apr 2021 12:28:06 -0400
Subject: [PATCH] Moved default wallet creation to  so it is constrained to
 test code

---
 .../src/burnchains/bitcoin_regtest_controller.rs  |  5 +++++
 testnet/stacks-node/src/run_loop/neon.rs          | 15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
index b6da86b8e..f8c2563a5 100644
--- a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
+++ b/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
@@ -1546,6 +1546,11 @@ impl BurnchainController for BitcoinRegtestController {
                     panic!();
                 }
             }
+            info!("Creating wallet if it does not exist");
+            match self.create_wallet_if_dne() {
+                Err(e) => warn!("Error when creating wallet: {:?}", e),
+                _ => {}
+            }
         }
     }
 }
diff --git a/testnet/stacks-node/src/run_loop/neon.rs b/testnet/stacks-node/src/run_loop/neon.rs
index 8acb640cd..a07535449 100644
--- a/testnet/stacks-node/src/run_loop/neon.rs
+++ b/testnet/stacks-node/src/run_loop/neon.rs
@@ -90,18 +90,6 @@ impl RunLoop {
     #[cfg(not(test))]
     fn bump_blocks_processed(&self) {}
 
-    #[cfg(test)]
-    fn create_wallet_if_dne(&self, burnchain: &BitcoinRegtestController) {
-        info!("Miner node: creating the wallet if it does not exist");
-        match burnchain.create_wallet_if_dne() {
-            Err(e) => warn!("Error when creating wallet: {:?}", e),
-            _ => {}
-        }
-    }
-
-    #[cfg(not(test))]
-    fn create_wallet_if_dne(&self, burnchain: &BitcoinRegtestController) {}
-
     /// Starts the testnet runloop.
     ///
     /// This function will block by looping infinitely.
@@ -135,9 +123,6 @@ impl RunLoop {
         let pox_constants = burnchain.get_pox_constants();
 
         let is_miner = if self.config.node.miner {
-            // Initialize the wallet.
-            self.create_wallet_if_dne(&burnchain);
-
             let keychain = Keychain::default(self.config.node.seed.clone());
             let node_address = Keychain::address_from_burnchain_signer(
                 &keychain.get_burnchain_signer(),