refactor(contract): factor out shared gen_authenticated_participants helper (#3654)

Author: pbeza

crates/contract/src/foreign_chain_rpc.rs

@@ -246,12 +246,12 @@ impl ForeignChainRpcWhitelist {
 #[expect(non_snake_case)]
 mod tests {
     use super::*;
-    use crate::primitives::{key_state::AuthenticatedParticipantId, test_utils::gen_participants};
+    use crate::primitives::{
+        key_state::AuthenticatedParticipantId, test_utils::gen_authenticated_participants,
+    };
     use assert_matches::assert_matches;
     use mpc_primitives::Threshold;
     use near_mpc_contract_interface::types::AuthScheme;
-    use near_sdk::test_utils::VMContextBuilder;
-    use near_sdk::testing_env;
 
     /// Build a `ThresholdParameters` for tests, bypassing the relative-threshold
     /// validation so tests can express edge-case combinations (e.g. the stale-votes
@@ -300,22 +300,6 @@ mod tests {
         NonEmptyBTreeMap::try_from(map).expect("test setup: batch must be non-empty")
     }
 
-    /// Build `n` participants and pre-authenticate each one. The pattern intentionally
-    /// runs all `testing_env!` resets *before* any storage-backed state is touched —
-    /// later vote ops can then write to the mocked storage without an env reset
-    /// wiping prior writes.
-    fn setup(n: usize) -> (Participants, Vec<AuthenticatedParticipantId>) {
-        let participants = gen_participants(n);
-        let mut auth_ids = Vec::with_capacity(n);
-        for (account_id, _, _) in participants.participants() {
-            let mut ctx = VMContextBuilder::new();
-            ctx.signer_account_id(account_id.clone());
-            testing_env!(ctx.build());
-            auth_ids.push(AuthenticatedParticipantId::new(&participants).unwrap());
-        }
-        (participants, auth_ids)
-    }
-
     fn assert_malformed(err: Error, reason_substring: &str) {
         match err {
             Error::InvalidParameters(InvalidParameters::MalformedPayload { reason }) => {
@@ -363,7 +347,7 @@ mod tests {
     #[test]
     fn vote__should_apply_chain_when_all_participants_match() {
         // Given
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
 
         // When
@@ -406,7 +390,7 @@ mod tests {
     fn vote__should_canonicalize_provider_order_for_threshold_comparison() {
         // Two participants submit the same logical set in different orders.
         // Given
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
 
         // When
@@ -431,7 +415,7 @@ mod tests {
     #[test]
     fn vote__should_apply_chains_independently() {
         // Given
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
 
         // When: both participants agree on Ethereum, disagree on Polygon.
@@ -475,7 +459,7 @@ mod tests {
     #[test]
     fn vote__should_overwrite_only_mentioned_chain_slots_on_recast() {
         // Given
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         let p0 = auth_ids[0].clone();
         wl.vote(
@@ -501,7 +485,7 @@ mod tests {
     #[test]
     fn vote__should_overwrite_same_chain_slot_with_latest_proposal() {
         // Given: p0 has voted Polygon with providers=[alchemy], response quorum=1.
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         let p0 = auth_ids[0].clone();
         wl.vote(
@@ -542,7 +526,7 @@ mod tests {
     #[test]
     fn vote__should_replace_full_chain_state_on_apply() {
         // Given: chain currently holds [alchemy, ankr].
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         wl.vote(
             auth_ids[0].clone(),
@@ -583,7 +567,7 @@ mod tests {
 
     #[test]
     fn vote__should_return_err_on_zero_quorum() {
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         let err = wl
             .vote(
@@ -597,7 +581,7 @@ mod tests {
 
     #[test]
     fn vote__should_return_err_on_quorum_exceeding_providers_len() {
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         let err = wl
             .vote(
@@ -611,7 +595,7 @@ mod tests {
 
     #[test]
     fn vote__should_return_err_on_path_segment_with_slash() {
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         let bad = (
             ProviderId("ankr".to_string()),
@@ -641,7 +625,7 @@ mod tests {
 
     #[test]
     fn vote__should_return_err_on_query_param_name_colliding_with_auth_query() {
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         let bad = (
             ProviderId("drpc".to_string()),
@@ -675,7 +659,7 @@ mod tests {
     #[test]
     fn vote__should_accept_non_colliding_query_param_and_auth_query() {
         // Given
-        let (participants, auth_ids) = setup(2);
+        let (participants, auth_ids) = gen_authenticated_participants(2);
         let mut wl = ForeignChainRpcWhitelist::default();
         let drpc = || {
             (
@@ -727,7 +711,7 @@ mod tests {
     fn vote__should_not_count_stale_non_participant_votes() {
         // Given: 3 participants; p0 and p1 each vote the same proposal — chain
         // hasn't applied yet (count = 2, threshold = 3).
-        let (participants, auth_ids) = setup(3);
+        let (participants, auth_ids) = gen_authenticated_participants(3);
         let mut wl = ForeignChainRpcWhitelist::default();
         wl.vote(
             auth_ids[0].clone(),
@@ -765,7 +749,7 @@ mod tests {
     #[test]
     fn clean_non_participant_votes__should_drop_stale_votes() {
         // Given
-        let (participants, auth_ids) = setup(3);
+        let (participants, auth_ids) = gen_authenticated_participants(3);
         let mut wl = ForeignChainRpcWhitelist::default();
         let p0 = auth_ids[0].clone();
         let p1 = auth_ids[1].clone();

crates/contract/src/primitives/domain.rs

@@ -285,16 +285,13 @@ impl AddDomainsVotes {
 #[expect(non_snake_case)]
 pub mod tests {
     use super::{
-        AddDomainsVotes, Curve, DomainConfig, DomainId, DomainPurpose, DomainRegistry,
-        Participants, Protocol, is_valid_protocol_for_purpose, validate_domain_purpose,
+        AddDomainsVotes, Curve, DomainConfig, DomainId, DomainPurpose, DomainRegistry, Protocol,
+        is_valid_protocol_for_purpose, validate_domain_purpose,
     };
-    use crate::primitives::key_state::AuthenticatedParticipantId;
     use crate::primitives::test_utils::{
-        gen_participant, gen_participants, infer_purpose_from_protocol,
+        gen_authenticated_participants, gen_participants, infer_purpose_from_protocol,
     };
     use near_mpc_contract_interface::types::ReconstructionThreshold;
-    use near_sdk::test_utils::VMContextBuilder;
-    use near_sdk::testing_env;
     use rstest::rstest;
     use std::collections::BTreeMap;
 
@@ -498,24 +495,6 @@ pub mod tests {
         assert_eq!(validate_domain_purpose(&domain).is_ok(), expected_ok);
     }
 
-    fn setup_participants(n: usize) -> (Participants, Vec<AuthenticatedParticipantId>) {
-        let mut participants = Participants::new();
-        let mut accounts = Vec::new();
-        for i in 0..n {
-            let (account_id, info) = gen_participant(i);
-            accounts.push(account_id.clone());
-            participants.insert(account_id, info).unwrap();
-        }
-        let mut auth_ids = Vec::new();
-        for account_id in &accounts {
-            let mut ctx = VMContextBuilder::new();
-            ctx.signer_account_id(account_id.clone());
-            testing_env!(ctx.build());
-            auth_ids.push(AuthenticatedParticipantId::new(&participants).unwrap());
-        }
-        (participants, auth_ids)
-    }
-
     fn sample_proposal() -> Vec<DomainConfig> {
         vec![DomainConfig {
             id: DomainId(0),
@@ -541,7 +520,7 @@ pub mod tests {
     #[test]
     fn test_get_remaining_votes_all_voters_still_participants() {
         // Given
-        let (participants, auth_ids) = setup_participants(3);
+        let (participants, auth_ids) = gen_authenticated_participants(3);
         let proposal = sample_proposal();
         let mut votes = AddDomainsVotes::default();
         for auth_id in &auth_ids {
@@ -558,7 +537,7 @@ pub mod tests {
     #[test]
     fn test_get_remaining_votes_some_voters_removed() {
         // Given
-        let (participants, auth_ids) = setup_participants(3);
+        let (participants, auth_ids) = gen_authenticated_participants(3);
         let proposal = sample_proposal();
         let mut votes = AddDomainsVotes::default();
         for auth_id in &auth_ids {
@@ -577,7 +556,7 @@ pub mod tests {
     #[test]
     fn test_get_remaining_votes_all_voters_removed() {
         // Given
-        let (_, auth_ids) = setup_participants(3);
+        let (_, auth_ids) = gen_authenticated_participants(3);
         let proposal = sample_proposal();
         let mut votes = AddDomainsVotes::default();
         for auth_id in &auth_ids {
@@ -595,7 +574,7 @@ pub mod tests {
     #[test]
     fn test_get_remaining_votes_preserves_different_proposals() {
         // Given
-        let (participants, auth_ids) = setup_participants(3);
+        let (participants, auth_ids) = gen_authenticated_participants(3);
         let proposal_a = vec![DomainConfig {
             id: DomainId(0),
             protocol: Protocol::CaitSith,

crates/contract/src/primitives/test_utils.rs

@@ -2,6 +2,7 @@ use super::domain::DomainRegistry;
 use crate::{
     crypto_shared::types::{PublicKeyExtended, serializable::SerializableEdwardsPoint},
     primitives::{
+        key_state::AuthenticatedParticipantId,
         participants::{ParticipantInfo, Participants},
         thresholds::{
             ProposedThresholdParameters, Threshold, ThresholdParameters,
@@ -14,6 +15,7 @@ use near_account_id::AccountId;
 use near_mpc_contract_interface::types::{
     DomainConfig, DomainId, DomainPurpose, Protocol, ReconstructionThreshold,
 };
+use near_sdk::{test_utils::VMContextBuilder, testing_env};
 use rand::{Rng, SeedableRng, distributions::Uniform, rngs::StdRng};
 use std::collections::BTreeMap;
 // Re-export for convenience
@@ -145,6 +147,20 @@ pub fn gen_participants(n: usize) -> Participants {
     participants
 }
 
+/// Build `n` participants and pre-authenticate each, returning the set alongside
+/// each participant's [`AuthenticatedParticipantId`].
+pub fn gen_authenticated_participants(n: usize) -> (Participants, Vec<AuthenticatedParticipantId>) {
+    let participants = gen_participants(n);
+    let mut auth_ids = Vec::with_capacity(n);
+    for (account_id, _, _) in participants.participants() {
+        let mut ctx = VMContextBuilder::new();
+        ctx.signer_account_id(account_id.clone());
+        testing_env!(ctx.build());
+        auth_ids.push(AuthenticatedParticipantId::new(&participants).unwrap());
+    }
+    (participants, auth_ids)
+}
+
 pub fn gen_seed() -> [u8; 32] {
     let mut rng = rand::thread_rng();
     let mut seed = [0u8; 32];

crates/contract/src/tee/verifier_votes.rs

@@ -110,27 +110,13 @@ impl TeeVerifierVotes {
 #[expect(non_snake_case)]
 mod tests {
     use super::*;
-    use crate::primitives::test_utils::gen_participants;
+    use crate::primitives::test_utils::{gen_authenticated_participants, gen_participants};
     use mpc_primitives::Threshold;
-    use near_sdk::{test_utils::VMContextBuilder, testing_env};
 
     fn threshold_params(participants: &Participants, threshold: u64) -> ThresholdParameters {
         ThresholdParameters::new_unvalidated(participants.clone(), Threshold::new(threshold))
     }
 
-    /// Build `n` participants and pre-authenticate each.
-    fn setup(n: usize) -> (Participants, Vec<AuthenticatedParticipantId>) {
-        let participants = gen_participants(n);
-        let mut auth_ids = Vec::with_capacity(n);
-        for (account_id, _, _) in participants.participants() {
-            let mut ctx = VMContextBuilder::new();
-            ctx.signer_account_id(account_id.clone());
-            testing_env!(ctx.build());
-            auth_ids.push(AuthenticatedParticipantId::new(&participants).unwrap());
-        }
-        (participants, auth_ids)
-    }
-
     fn proposal(account: &str, hash_byte: u8) -> VerifierChangeProposal {
         VerifierChangeProposal {
             candidate_account_id: account.parse().unwrap(),
@@ -148,7 +134,7 @@ mod tests {
         Vec<AuthenticatedParticipantId>,
         TeeVerifierVotes,
     ) {
-        let (participants, voters) = setup(3);
+        let (participants, voters) = gen_authenticated_participants(3);
         let params = threshold_params(&participants, threshold);
         (
             participants.clone(),