Fix: 5159, 5169, 5171, 5172, and others

.github/workflows/bitcoin-tests.yml

@@ -105,6 +105,10 @@ jobs:
           - tests::signer::v0::locally_rejected_blocks_overriden_by_global_acceptance
           - tests::signer::v0::reorg_locally_accepted_blocks_across_tenures_succeeds
           - tests::signer::v0::miner_recovers_when_broadcast_block_delay_across_tenures_occurs
+          - tests::signer::v0::multiple_miners_with_nakamoto_blocks
+          - tests::signer::v0::partial_tenure_fork
+          - tests::signer::v0::mine_2_nakamoto_reward_cycles
+          - tests::signer::v0::signer_set_rollover
           - tests::nakamoto_integrations::stack_stx_burn_op_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state
@@ -117,10 +121,19 @@ jobs:
           - tests::nakamoto_integrations::follower_bootup_across_multiple_cycles
           - tests::nakamoto_integrations::utxo_check_on_startup_panic
           - tests::nakamoto_integrations::utxo_check_on_startup_recover
-          - tests::signer::v0::multiple_miners_with_nakamoto_blocks
-          - tests::signer::v0::partial_tenure_fork
-          - tests::signer::v0::mine_2_nakamoto_reward_cycles
-          - tests::signer::v0::signer_set_rollover
+          - tests::p2p::convergence::test_walk_ring_allow_15
+          - tests::p2p::convergence::test_walk_ring_15_plain
+          - tests::p2p::convergence::test_walk_ring_15_pingback
+          - tests::p2p::convergence::test_walk_ring_15_org_biased
+          - tests::p2p::convergence::test_walk_line_allowed_15
+          - tests::p2p::convergence::test_walk_line_15_plain
+          - tests::p2p::convergence::test_walk_line_15_org_biased
+          - tests::p2p::convergence::test_walk_line_15_pingback
+          - tests::p2p::convergence::test_walk_star_allowed_15
+          - tests::p2p::convergence::test_walk_star_15_plain
+          - tests::p2p::convergence::test_walk_star_15_pingback
+          - tests::p2p::convergence::test_walk_star_15_org_biased
+          - tests::p2p::convergence::test_walk_inbound_line_15
           # Do not run this one until we figure out why it fails in CI
           # - tests::neon_integrations::bitcoin_reorg_flap
           # - tests::neon_integrations::bitcoin_reorg_flap_with_follower

stackslib/Cargo.toml

@@ -59,6 +59,10 @@ siphasher = "0.3.7"
 wsts = { workspace = true }
 hashbrown = { workspace = true }
 rusqlite = { workspace = true }
+rstest = { version = "0.17.0", optional = true }
+rstest_reuse = { version = "0.5.0", optional = true }
+stdext = { version = "0.3.1", optional = true }
+stx-genesis = { path = "../stx-genesis", optional = true }
 
 [target.'cfg(not(any(target_os = "macos",target_os="windows", target_arch = "arm" )))'.dependencies]
 tikv-jemallocator = {workspace = true}
@@ -95,7 +99,7 @@ features = ["std"]
 assert-json-diff = "1.0.0"
 criterion = "0.3.5"
 stdext = "0.3.1"
-stx-genesis = { path = "../stx-genesis"}
+stx-genesis = { path = "../stx-genesis" }
 clarity = { features = ["default", "testing"], path = "../clarity" }
 stacks-common = { features = ["default", "testing"], path = "../stacks-common" }
 rstest = "0.17.0"
@@ -109,7 +113,7 @@ disable-costs = []
 developer-mode = ["clarity/developer-mode"]
 monitoring_prom = ["prometheus"]
 slog_json = ["slog-json", "stacks-common/slog_json", "clarity/slog_json", "pox-locking/slog_json"]
-testing = []
+testing = ["stdext", "rstest", "rstest_reuse", "stx-genesis"]
 
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
 sha2 = { version = "0.10", features = ["asm"] }

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -167,7 +167,7 @@ impl BitcoinIndexerConfig {
         }
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn test_default(spv_headers_path: String) -> BitcoinIndexerConfig {
         BitcoinIndexerConfig {
             peer_host: "127.0.0.1".to_string(),
@@ -203,7 +203,7 @@ impl BitcoinIndexerRuntime {
 }
 
 impl BitcoinIndexer {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new(
         config: BitcoinIndexerConfig,
         runtime: BitcoinIndexerRuntime,
@@ -216,7 +216,7 @@ impl BitcoinIndexer {
         }
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new_unit_test(working_dir: &str) -> BitcoinIndexer {
         let mut working_dir_path = PathBuf::from(working_dir);
         if fs::metadata(&working_dir_path).is_err() {
@@ -861,7 +861,7 @@ impl BitcoinIndexer {
         Ok(new_tip)
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn raw_store_header(&mut self, header: BurnchainBlockHeader) -> Result<(), btc_error> {
         let mut spv_client = SpvClient::new(
             &self.config.spv_headers_path,
@@ -887,7 +887,7 @@ impl BitcoinIndexer {
         Ok(())
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn mock_bitcoin_header(
         parent_block_hash: &BurnchainHeaderHash,
         timestamp: u32,

stackslib/src/burnchains/bitcoin/spv.rs

@@ -182,7 +182,7 @@ impl SpvClient {
         Ok(client)
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new_without_migration(
         headers_path: &str,
         start_block: u64,
@@ -211,7 +211,7 @@ impl SpvClient {
         Ok(client)
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn disable_check_txcount(&mut self) {
         self.check_txcount = false;
     }
@@ -220,7 +220,7 @@ impl SpvClient {
         &self.headers_db
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn conn_mut(&mut self) -> &mut DBConn {
         &mut self.headers_db
     }
@@ -277,7 +277,7 @@ impl SpvClient {
             .and_then(|_| Ok(()))
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn test_db_migrate(conn: &mut DBConn) -> Result<(), btc_error> {
         SpvClient::db_migrate(conn)
     }
@@ -925,7 +925,7 @@ impl SpvClient {
         Ok(())
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn test_write_block_headers(
         &mut self,
         height: u64,

stackslib/src/burnchains/burnchain.rs

@@ -623,7 +623,7 @@ impl Burnchain {
         ret
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn default_unittest(
         first_block_height: u64,
         first_block_hash: &BurnchainHeaderHash,

stackslib/src/burnchains/mod.rs

@@ -57,7 +57,7 @@ pub mod burnchain;
 pub mod db;
 pub mod indexer;
 
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 pub mod tests;
 
 pub struct Txid(pub [u8; 32]);
@@ -351,7 +351,7 @@ impl PoxConstants {
             _shadow: PhantomData,
         }
     }
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn test_default() -> PoxConstants {
         // 20 reward slots; 10 prepare-phase slots
         PoxConstants::new(
@@ -369,7 +369,7 @@ impl PoxConstants {
         )
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     /// Create a PoX constants used in tests with 5-block cycles,
     ///  3-block prepare phases, a threshold of 3, rejection fraction of 25%,
     ///  a participation threshold of 5% and no sunset or transition to pox-2 or beyond.
@@ -821,7 +821,7 @@ impl From<btc_error> for Error {
 }
 
 impl BurnchainView {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn make_test_data(&mut self) {
         let oldest_height = if self.burn_stable_block_height < MAX_NEIGHBOR_BLOCK_DELAY {
             0

stackslib/src/burnchains/tests/db.rs

@@ -49,7 +49,7 @@ impl BurnchainDB {
 
     /// Get back all of the parsed burnchain operations for a given block.
     /// Used in testing to replay burnchain data.
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn get_burnchain_block_ops(
         &self,
         block_hash: &BurnchainHeaderHash,

stackslib/src/burnchains/tests/mod.rs

@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#![allow(unused)]
 
 pub mod affirmation;
 pub mod burnchain;

stackslib/src/chainstate/burn/db/sortdb.rs

@@ -5482,7 +5482,7 @@ impl<'a> SortitionHandleTx<'a> {
             sn.canonical_stacks_tip_height,
         )?;
 
-        #[cfg(test)]
+        #[cfg(any(test, feature = "testing"))]
         {
             let (block_consensus_hash, block_bhh) =
                 SortitionDB::get_canonical_stacks_chain_tip_hash(self).unwrap();
@@ -6566,7 +6566,7 @@ impl ChainstateDB for SortitionDB {
     }
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 pub mod tests {
     use std::sync::mpsc::sync_channel;
     use std::thread;

stackslib/src/chainstate/burn/distribution.rs

@@ -424,7 +424,7 @@ impl BurnSamplePoint {
     }
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 mod tests {
     use std::marker::PhantomData;
 

stackslib/src/chainstate/burn/operations/leader_block_commit.rs

@@ -90,7 +90,7 @@ pub static OUTPUTS_PER_COMMIT: usize = 2;
 pub static BURN_BLOCK_MINED_AT_MODULUS: u64 = 5;
 
 impl LeaderBlockCommitOp {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn initial(
         block_header_hash: &BlockHeaderHash,
         block_height: u64,
@@ -131,10 +131,10 @@ impl LeaderBlockCommitOp {
         }
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new(
         block_header_hash: &BlockHeaderHash,
-        block_height: u64,
+        _block_height: u64,
         new_seed: &VRFSeed,
         parent: &LeaderBlockCommitOp,
         key_block_ptr: u32,
@@ -170,7 +170,7 @@ impl LeaderBlockCommitOp {
         }
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn set_burn_height(&mut self, height: u64) {
         self.block_height = height;
         let new_burn_parent_modulus = if height > 0 {

stackslib/src/chainstate/burn/operations/leader_key_register.rs

@@ -44,7 +44,7 @@ pub struct ParsedData {
 }
 
 impl LeaderKeyRegisterOp {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new(public_key: &VRFPublicKey) -> LeaderKeyRegisterOp {
         LeaderKeyRegisterOp {
             public_key: public_key.clone(),
@@ -59,10 +59,10 @@ impl LeaderKeyRegisterOp {
         }
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new_from_secrets(
-        num_sigs: u16,
-        hash_mode: &AddressHashMode,
+        _num_sigs: u16,
+        _hash_mode: &AddressHashMode,
         prover_key: &VRFPrivateKey,
     ) -> Option<LeaderKeyRegisterOp> {
         let prover_pubk = VRFPublicKey::from_private(prover_key);

stackslib/src/chainstate/burn/operations/mod.rs

@@ -47,7 +47,7 @@ pub mod stack_stx;
 pub mod transfer_stx;
 pub mod vote_for_aggregate_key;
 
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 mod test;
 
 /// This module contains all burn-chain operations
@@ -439,7 +439,7 @@ impl BlockstackOperationType {
         }
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn set_block_height(&mut self, height: u64) {
         match self {
             BlockstackOperationType::LeaderKeyRegister(ref mut data) => data.block_height = height,
@@ -456,7 +456,7 @@ impl BlockstackOperationType {
         };
     }
 
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn set_burn_header_hash(&mut self, hash: BurnchainHeaderHash) {
         match self {
             BlockstackOperationType::LeaderKeyRegister(ref mut data) => {

stackslib/src/chainstate/burn/operations/stack_stx.rs

@@ -57,7 +57,7 @@ struct ParsedData {
 pub static OUTPUTS_PER_COMMIT: usize = 2;
 
 impl PreStxOp {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new(sender: &StacksAddress) -> PreStxOp {
         PreStxOp {
             output: sender.clone(),
@@ -155,7 +155,7 @@ impl PreStxOp {
 }
 
 impl StackStxOp {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new(
         sender: &StacksAddress,
         reward_addr: &PoxAddress,

stackslib/src/chainstate/burn/operations/transfer_stx.rs

@@ -46,7 +46,7 @@ struct ParsedData {
 }
 
 impl TransferStxOp {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testing"))]
     pub fn new(
         sender: &StacksAddress,
         recipient: &StacksAddress,