Merge pull request #6557 from jferrant/chore/extract-test-chainstate-from-peer

Make TestPeer use TestChainstate internally

Author: jferrant

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
-## Unreleased
+## [3.2.0.0.2]
 
 ### Added
 

stacks-signer/CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
 
-## Unreleased
+## [3.2.0.0.2.0]
 
 ### Added
 

stackslib/src/chainstate/nakamoto/coordinator/tests.rs

@@ -843,7 +843,7 @@ impl NakamotoBlockHeader {
             .map_err(|_| ChainstateError::NoRegisteredSigners(0))?;
 
         // HashMap of <PublicKey, (Signer, Index)>
-        let signers_by_pk: HashMap<_, _> = signers
+        let mut signers_by_pk: HashMap<_, _> = signers
             .iter()
             .enumerate()
             .map(|(i, signer)| (&signer.signing_key, (signer, i)))
@@ -861,7 +861,7 @@ impl NakamotoBlockHeader {
             let mut public_key_bytes = [0u8; 33];
             public_key_bytes.copy_from_slice(&public_key.to_bytes_compressed()[..]);
 
-            let (signer, signer_index) = signers_by_pk.get(&public_key_bytes).ok_or_else(|| {
+            let (signer, signer_index) = signers_by_pk.remove(&public_key_bytes).ok_or_else(|| {
                 warn!(
                     "Found an invalid public key. Reward set has {} signers. Chain length {}. Signatures length {}",
                     signers.len(),
@@ -876,13 +876,13 @@ impl NakamotoBlockHeader {
 
             // Enforce order of signatures
             if let Some(index) = last_index.as_ref() {
-                if *index >= *signer_index {
+                if *index >= signer_index {
                     return Err(ChainstateError::InvalidStacksBlock(
                         "Signatures are out of order".to_string(),
                     ));
                 }
             } else {
-                last_index = Some(*signer_index);
+                last_index = Some(signer_index);
             }
 
             total_weight_signed = total_weight_signed

stackslib/src/chainstate/nakamoto/mod.rs

@@ -1991,7 +1991,7 @@ fn test_make_miners_stackerdb_config() {
         None,
     );
 
-    let naka_miner_hash160 = peer.miner.nakamoto_miner_hash160();
+    let naka_miner_hash160 = peer.chain.miner.nakamoto_miner_hash160();
     let miner_keys: Vec<_> = (0..10).map(|_| StacksPrivateKey::random()).collect();
     let miner_hash160s: Vec<_> = miner_keys
         .iter()
@@ -2009,8 +2009,8 @@ fn test_make_miners_stackerdb_config() {
     debug!("miners = {:#?}", &miner_hash160s);
 
     // extract chainstate, sortdb, and stackerdbs -- we don't need the peer anymore
-    let chainstate = &mut peer.stacks_node.as_mut().unwrap().chainstate;
-    let sort_db = peer.sortdb.as_mut().unwrap();
+    let chainstate = &mut peer.chain.stacks_node.as_mut().unwrap().chainstate;
+    let sort_db = peer.chain.sortdb.as_mut().unwrap();
     let mut last_snapshot = SortitionDB::get_canonical_burn_chain_tip(sort_db.conn()).unwrap();
     let stackerdbs = peer.network.stackerdbs;
     let miners_contract_id = boot_code_id(MINERS_NAME, false);
@@ -3261,9 +3261,7 @@ pub mod nakamoto_block_signatures {
 
         match header.verify_signer_signatures(&reward_set) {
             Ok(_) => panic!("Expected duplicate signature to fail"),
-            Err(ChainstateError::InvalidStacksBlock(msg)) => {
-                assert!(msg.contains("Signatures are out of order"));
-            }
+            Err(ChainstateError::InvalidStacksBlock(_)) => {}
             _ => panic!("Expected InvalidStacksBlock error"),
         }
     }