Use test_executor for reveal error tests

private-attribution · Mar 11, 2024 · fdb9dc2 · fdb9dc2
1 parent 08d7520
commit fdb9dc2
Showing 1 changed file with 63 additions and 62 deletions.
diff --git a/ipa-core/src/protocol/basics/reveal.rs b/ipa-core/src/protocol/basics/reveal.rs
@@ -212,6 +212,7 @@ mod tests {
             },
             IntoShares, SharedValue,
         },
+        test_executor::run,
         test_fixture::{join3v, Runner, TestWorld},
     };
 
@@ -382,76 +383,76 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test]
-    pub async fn malicious_validation_fail() -> Result<(), Error> {
-        let mut rng = thread_rng();
-        let world = TestWorld::default();
-        let sh_ctx = world.malicious_contexts();
-        let v = sh_ctx.map(UpgradableContext::validator);
-        let m_ctx: [_; 3] = v
-            .iter()
-            .map(|v| v.context().set_total_records(1))
-            .collect::<Vec<_>>()
-            .try_into()
-            .unwrap();
-
-        let record_id = RecordId::from(0);
-        let input: Fp31 = rng.gen();
+    #[test]
+    pub fn malicious_validation_fail() {
+        run(|| async {
+            let mut rng = thread_rng();
+            let world = TestWorld::default();
+            let sh_ctx = world.malicious_contexts();
+            let v = sh_ctx.map(UpgradableContext::validator);
+            let m_ctx: [_; 3] = v
+                .iter()
+                .map(|v| v.context().set_total_records(1))
+                .collect::<Vec<_>>()
+                .try_into()
+                .unwrap();
 
-        let m_shares = join3v(
-            zip(m_ctx.iter(), input.share_with(&mut rng))
-                .map(|(m_ctx, share)| async { m_ctx.upgrade(share).await }),
-        )
-        .await;
-        let result = try_join3(
-            m_shares[0].reveal(m_ctx[0].clone(), record_id),
-            m_shares[1].reveal(m_ctx[1].clone(), record_id),
-            reveal_with_additive_attack(
-                m_ctx[2].clone(),
-                record_id,
-                &m_shares[2],
-                false,
-                Fp31::ONE,
-            ),
-        )
-        .await;
+            let record_id = RecordId::from(0);
+            let input: Fp31 = rng.gen();
 
-        assert!(matches!(result, Err(Error::MaliciousRevealFailed)));
+            let m_shares = join3v(
+                zip(m_ctx.iter(), input.share_with(&mut rng))
+                    .map(|(m_ctx, share)| async { m_ctx.upgrade(share).await }),
+            )
+            .await;
+            let result = try_join3(
+                m_shares[0].reveal(m_ctx[0].clone(), record_id),
+                m_shares[1].reveal(m_ctx[1].clone(), record_id),
+                reveal_with_additive_attack(
+                    m_ctx[2].clone(),
+                    record_id,
+                    &m_shares[2],
+                    false,
+                    Fp31::ONE,
+                ),
+            )
+            .await;
 
-        Ok(())
+            assert!(matches!(result, Err(Error::MaliciousRevealFailed)));
+        })
     }
 
-    #[tokio::test]
-    pub async fn malicious_partial_validation_fail() -> Result<(), Error> {
-        let mut rng = thread_rng();
-        let world = TestWorld::default();
-        let sh_ctx = world.malicious_contexts();
-        let v = sh_ctx.map(UpgradableContext::validator);
-        let m_ctx: [_; 3] = v
-            .iter()
-            .map(|v| v.context().set_total_records(1))
-            .collect::<Vec<_>>()
-            .try_into()
-            .unwrap();
-
-        let record_id = RecordId::from(0);
-        let input: Fp31 = rng.gen();
+    #[test]
+    pub fn malicious_partial_validation_fail()  {
+        run(|| async {
+            let mut rng = thread_rng();
+            let world = TestWorld::default();
+            let sh_ctx = world.malicious_contexts();
+            let v = sh_ctx.map(UpgradableContext::validator);
+            let m_ctx: [_; 3] = v
+                .iter()
+                .map(|v| v.context().set_total_records(1))
+                .collect::<Vec<_>>()
+                .try_into()
+                .unwrap();
 
-        let m_shares = join3v(
-            zip(m_ctx.iter(), input.share_with(&mut rng))
-                .map(|(m_ctx, share)| async { m_ctx.upgrade(share).await }),
-        )
-        .await;
-        let result = try_join3(
-            m_shares[0].partial_reveal(m_ctx[0].clone(), record_id, Role::H3),
-            m_shares[1].partial_reveal(m_ctx[1].clone(), record_id, Role::H3),
-            reveal_with_additive_attack(m_ctx[2].clone(), record_id, &m_shares[2], true, Fp31::ONE),
-        )
-        .await;
+            let record_id = RecordId::from(0);
+            let input: Fp31 = rng.gen();
 
-        assert!(matches!(result, Err(Error::MaliciousRevealFailed)));
+            let m_shares = join3v(
+                zip(m_ctx.iter(), input.share_with(&mut rng))
+                    .map(|(m_ctx, share)| async { m_ctx.upgrade(share).await }),
+            )
+            .await;
+            let result = try_join3(
+                m_shares[0].partial_reveal(m_ctx[0].clone(), record_id, Role::H3),
+                m_shares[1].partial_reveal(m_ctx[1].clone(), record_id, Role::H3),
+                reveal_with_additive_attack(m_ctx[2].clone(), record_id, &m_shares[2], true, Fp31::ONE),
+            )
+            .await;
 
-        Ok(())
+            assert!(matches!(result, Err(Error::MaliciousRevealFailed)));
+        })
     }
 
     pub async fn reveal_with_additive_attack<F: ExtendableField>(