Skip to content

feat: aac add marf computation in test harness #6560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

feat: aac add marf computation in test harness #6560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01ffedd
feat: add marf input computation for test-harness, #6523
fdefelici Oct 3, 2025
da5ab83
chore: add documentation for marf input computation, #6523
fdefelici Oct 3, 2025
b3bdc1d
chore: improve marf computation failure message, #6523
fdefelici Oct 3, 2025
32f3533
chore: remove unused marf_hash field, #6523
fdefelici Oct 3, 2025
6852a78
merge: develop with conflicts
fdefelici Oct 8, 2025
ef3aa82
chore: address test compile issue on windows requiring specify generi…
fdefelici Oct 8, 2025
12521f0
refactor: aac update test marf computation
fdefelici Oct 8, 2025
111595a
feat: add marf_hash to ExpectedBlockOutput
fdefelici Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stacks-signer/src/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 12 additions & 6 deletions stackslib/src/chainstate/nakamoto/test_signers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down
30 changes: 24 additions & 6 deletions stackslib/src/chainstate/nakamoto/tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading
Loading