Merge pull request #6560 from fdefelici/feat/aac-compute-marf

feat: aac add marf computation in test harness

Author: fdefelici

stacks-signer/src/client/mod.rs

@@ -224,7 +224,7 @@ pub(crate) mod tests {
 
     pub fn generate_random_consensus_hash() -> ConsensusHash {
         let rng = rand::thread_rng();
-        let bytes: Vec<u8> = rng.sample_iter(Standard).take(20).collect();
+        let bytes: Vec<u8> = rng.sample_iter::<u8, _>(Standard).take(20).collect();
         let mut hash = [0u8; 20];
         hash.copy_from_slice(&bytes);
         ConsensusHash(hash)

stackslib/src/chainstate/nakamoto/test_signers.rs

@@ -44,8 +44,10 @@ pub struct TestSigners {
 
 impl Default for TestSigners {
     fn default() -> Self {
-        let aggregate_public_key: Vec<u8> =
-            rand::thread_rng().sample_iter(Standard).take(33).collect();
+        let aggregate_public_key: Vec<u8> = rand::thread_rng()
+            .sample_iter::<u8, _>(Standard)
+            .take(33)
+            .collect();
         let num_signers = 5;
         let threshold = 5 * 7 / 10;
 
@@ -70,8 +72,10 @@ impl TestSigners {
 
     /// Internal function to generate aggregate key information
     fn default_with_signers(signer_keys: Vec<Secp256k1PrivateKey>) -> Self {
-        let aggregate_public_key: Vec<u8> =
-            rand::thread_rng().sample_iter(Standard).take(33).collect();
+        let aggregate_public_key: Vec<u8> = rand::thread_rng()
+            .sample_iter::<u8, _>(Standard)
+            .take(33)
+            .collect();
         let num_signers = signer_keys.len();
         let threshold = u32::try_from(num_signers * 7 / 10).unwrap();
         Self {
@@ -227,8 +231,10 @@ impl TestSigners {
             return self.aggregate_public_key.clone();
         }
 
-        let aggregate_public_key: Vec<u8> =
-            rand::thread_rng().sample_iter(Standard).take(33).collect();
+        let aggregate_public_key: Vec<u8> = rand::thread_rng()
+            .sample_iter::<u8, _>(Standard)
+            .take(33)
+            .collect();
         self.aggregate_public_key.clone_from(&aggregate_public_key);
         aggregate_public_key
     }

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

@@ -2270,7 +2270,10 @@ fn parse_vote_for_aggregate_public_key_valid() {
     let signer_index = thread_rng().next_u64();
     let signer_index_arg = Value::UInt(signer_index as u128);
 
-    let aggregate_key: Vec<u8> = rand::thread_rng().sample_iter(Standard).take(33).collect();
+    let aggregate_key: Vec<u8> = rand::thread_rng()
+        .sample_iter::<u8, _>(Standard)
+        .take(33)
+        .collect();
     let aggregate_key_arg = Value::buff_from(aggregate_key.clone()).expect("Failed to create buff");
     let round = thread_rng().next_u64();
     let round_arg = Value::UInt(round as u128);
@@ -2316,7 +2319,10 @@ fn parse_vote_for_aggregate_public_key_invalid() {
 
     let signer_index = thread_rng().next_u32();
     let signer_index_arg = Value::UInt(signer_index as u128);
-    let aggregate_key: Vec<u8> = rand::thread_rng().sample_iter(Standard).take(33).collect();
+    let aggregate_key: Vec<u8> = rand::thread_rng()
+        .sample_iter::<u8, _>(Standard)
+        .take(33)
+        .collect();
     let aggregate_key_arg = Value::buff_from(aggregate_key).expect("Failed to create buff");
     let round = thread_rng().next_u64();
     let round_arg = Value::UInt(round as u128);
@@ -2498,7 +2504,10 @@ fn valid_vote_transaction() {
     let signer_index = thread_rng().next_u32();
     let signer_index_arg = Value::UInt(signer_index as u128);
 
-    let aggregate_key: Vec<u8> = rand::thread_rng().sample_iter(Standard).take(33).collect();
+    let aggregate_key: Vec<u8> = rand::thread_rng()
+        .sample_iter::<u8, _>(Standard)
+        .take(33)
+        .collect();
     let aggregate_key_arg = Value::buff_from(aggregate_key).expect("Failed to create buff");
     let round = thread_rng().next_u64();
     let round_arg = Value::UInt(round as u128);
@@ -2548,7 +2557,10 @@ fn valid_vote_transaction_malformed_transactions() {
     let signer_index = thread_rng().next_u32();
     let signer_index_arg = Value::UInt(signer_index as u128);
 
-    let aggregate_key: Vec<u8> = rand::thread_rng().sample_iter(Standard).take(33).collect();
+    let aggregate_key: Vec<u8> = rand::thread_rng()
+        .sample_iter::<u8, _>(Standard)
+        .take(33)
+        .collect();
     let aggregate_key_arg = Value::buff_from(aggregate_key).expect("Failed to create buff");
     let round = thread_rng().next_u64();
     let round_arg = Value::UInt(round as u128);
@@ -2782,7 +2794,10 @@ fn filter_one_transaction_per_signer_multiple_addresses() {
     let signer_index = thread_rng().next_u32();
     let signer_index_arg = Value::UInt(signer_index as u128);
 
-    let aggregate_key: Vec<u8> = rand::thread_rng().sample_iter(Standard).take(33).collect();
+    let aggregate_key: Vec<u8> = rand::thread_rng()
+        .sample_iter::<u8, _>(Standard)
+        .take(33)
+        .collect();
     let aggregate_key_arg = Value::buff_from(aggregate_key).expect("Failed to create buff");
     let round = thread_rng().next_u64();
     let round_arg = Value::UInt(round as u128);
@@ -2910,7 +2925,10 @@ fn filter_one_transaction_per_signer_duplicate_nonces() {
     let signer_index = thread_rng().next_u32();
     let signer_index_arg = Value::UInt(signer_index as u128);
 
-    let aggregate_key: Vec<u8> = rand::thread_rng().sample_iter(Standard).take(33).collect();
+    let aggregate_key: Vec<u8> = rand::thread_rng()
+        .sample_iter::<u8, _>(Standard)
+        .take(33)
+        .collect();
     let aggregate_key_arg = Value::buff_from(aggregate_key).expect("Failed to create buff");
     let round = thread_rng().next_u64();
     let round_arg = Value::UInt(round as u128);