Merge pull request #6163 from hstove/feat/signer-test-snapshots

feat: add snapshotting to SignerTest to improve boot time

Author: hstove

Cargo.lock

@@ -54,6 +54,7 @@ serial_test = "3.2.0"
 pinny = { git = "https://github.com/BitcoinL2-Labs/pinny-rs.git", rev = "54ba9d533a7b84525a5e65a3eae1a3ae76b9ea49" } #v0.0.2
 madhouse = { git = "https://github.com/stacks-network/madhouse-rs.git", rev = "fc651ddcbaf85e888b06d4a87aa788c4b7ba9309" }
 proptest = { git = "https://github.com/proptest-rs/proptest.git", rev = "c9bdf18c232665b2b740c667c81866b598d06dc7" }
+stdext = "0.3.1"
 
 [[bin]]
 name = "stacks-node"
@@ -70,5 +71,5 @@ prod-genesis-chainstate = []
 default = []
 testing = []
 
-[package.metadata.pinny] 
+[package.metadata.pinny]
 allowed = ["bitcoind", "flaky", "slow"]

testnet/stacks-node/Cargo.toml

@@ -2822,6 +2822,17 @@ impl BitcoinRPCRequest {
         Ok(())
     }
 
+    pub fn stop_bitcoind(config: &Config) -> RPCResult<serde_json::Value> {
+        let payload = BitcoinRPCRequest {
+            method: "stop".to_string(),
+            params: vec![],
+            id: "stacks".to_string(),
+            jsonrpc: "2.0".to_string(),
+        };
+
+        BitcoinRPCRequest::send(config, payload)
+    }
+
     pub fn send(config: &Config, payload: BitcoinRPCRequest) -> RPCResult<serde_json::Value> {
         let request = BitcoinRPCRequest::build_rpc_request(config, &payload);
         let timeout = Duration::from_secs(u64::from(config.burnchain.timeout));

testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

@@ -29,7 +29,7 @@ type BitcoinResult<T> = Result<T, BitcoinCoreError>;
 
 pub struct BitcoinCoreController {
     bitcoind_process: Option<Child>,
-    config: Config,
+    pub config: Config,
 }
 
 impl BitcoinCoreController {
@@ -63,6 +63,8 @@ impl BitcoinCoreController {
             .arg("-nodebug")
             .arg("-nodebuglogfile")
             .arg("-rest")
+            .arg("-persistmempool=1")
+            .arg("-dbcache=100")
             .arg("-txindex=1")
             .arg("-server=1")
             .arg("-listenonion=0")
@@ -101,26 +103,23 @@ impl BitcoinCoreController {
     }
 
     pub fn stop_bitcoind(&mut self) -> Result<(), BitcoinCoreError> {
-        if self.bitcoind_process.take().is_some() {
-            let payload = BitcoinRPCRequest {
-                method: "stop".to_string(),
-                params: vec![],
-                id: "stacks".to_string(),
-                jsonrpc: "2.0".to_string(),
-            };
-
-            let res = BitcoinRPCRequest::send(&self.config, payload)
+        if let Some(mut bitcoind_process) = self.bitcoind_process.take() {
+            let res = BitcoinRPCRequest::stop_bitcoind(&self.config)
                 .map_err(|e| BitcoinCoreError::StopFailed(format!("{e:?}")))?;
 
             if let Some(err) = res.get("error") {
                 if !err.is_null() {
                     return Err(BitcoinCoreError::StopFailed(format!("{err}")));
                 }
+            } else if let Some(_result) = res.get("result") {
+                // Expected, continue
             } else {
                 return Err(BitcoinCoreError::StopFailed(format!(
                     "Invalid response: {res:?}"
                 )));
             }
+
+            bitcoind_process.wait().unwrap();
         }
         Ok(())
     }

testnet/stacks-node/src/tests/bitcoin_regtest.rs

@@ -9221,7 +9221,7 @@ fn filter_txs_by_origin() {
 }
 
 // https://stackoverflow.com/questions/26958489/how-to-copy-a-folder-recursively-in-rust
-fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
+pub fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
     fs::create_dir_all(&dst)?;
     for entry in fs::read_dir(src)? {
         let entry = entry?;