Skip to content

Commit

Permalink
Update the processor's tests re: Batch SignId key
Browse files Browse the repository at this point in the history
key used to be empty. As part of implementing support for multisig rotation
into the coordinator, it was easiest to set the key to the substrate key. While
the coordinator and full stack tests were updated, the processor tests weren't.
This does that.
  • Loading branch information
kayabaNerve committed Sep 28, 2023
1 parent 7e27315 commit 4d1212e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions tests/processor/src/tests/batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use crate::{*, tests::*};

pub(crate) async fn recv_batch_preprocesses(
coordinators: &mut [Coordinator],
substrate_key: &[u8; 32],
attempt: u32,
) -> (SignId, HashMap<Participant, Vec<u8>>) {
let mut id = None;
Expand All @@ -36,7 +37,7 @@ pub(crate) async fn recv_batch_preprocesses(
},
) => {
if id.is_none() {
assert!(this_id.key.is_empty());
assert_eq!(&this_id.key, substrate_key);
assert_eq!(this_id.attempt, attempt);
id = Some(this_id.clone());
block = Some(this_block);
Expand Down Expand Up @@ -231,7 +232,8 @@ fn batch_test() {
tokio::time::sleep(Duration::from_secs(10)).await;

// Make sure the proceessors picked it up by checking they're trying to sign a batch for it
let (mut id, mut preprocesses) = recv_batch_preprocesses(&mut coordinators, 0).await;
let (mut id, mut preprocesses) =
recv_batch_preprocesses(&mut coordinators, &key_pair.0 .0, 0).await;
// Trigger a random amount of re-attempts
for attempt in 1 ..= u32::try_from(OsRng.next_u64() % 4).unwrap() {
// TODO: Double check how the processor handles this ID field
Expand All @@ -244,7 +246,8 @@ fn batch_test() {
})
.await;
}
(id, preprocesses) = recv_batch_preprocesses(&mut coordinators, attempt).await;
(id, preprocesses) =
recv_batch_preprocesses(&mut coordinators, &key_pair.0 .0, attempt).await;
}

// Continue with signing the batch
Expand Down
2 changes: 1 addition & 1 deletion tests/processor/src/tests/send.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ fn send_test() {
tokio::time::sleep(Duration::from_secs(10)).await;

// Make sure the proceessors picked it up by checking they're trying to sign a batch for it
let (id, preprocesses) = recv_batch_preprocesses(&mut coordinators, 0).await;
let (id, preprocesses) = recv_batch_preprocesses(&mut coordinators, &key_pair.0 .0, 0).await;

// Continue with signing the batch
let batch = sign_batch(&mut coordinators, key_pair.0 .0, id, preprocesses).await;
Expand Down

0 comments on commit 4d1212e

Please sign in to comment.