server: fix blocking rayon threads

Author: teddav

mpc-server/src/bin/gen_cert.rs

@@ -1,4 +1,4 @@
-use color_eyre::{eyre::Context, Result};
+use color_eyre::{Result, eyre::Context};
 use rcgen::CertifiedKey;
 use std::path::PathBuf;
 

mpc-server/src/matching.rs

@@ -44,7 +44,6 @@ pub async fn run_matches(
         .into_iter()
         .filter(|u| !user1.checked.contains(&u.id))
         .collect::<Vec<_>>();
-    println!("all users: {all_users:?}");
 
     update_checked(
         &conn,
@@ -61,36 +60,41 @@ pub async fn run_matches(
         .map(|u| u.id.clone())
         .collect::<Vec<String>>();
 
-    let verified_matches = all_users
-        .into_par_iter()
-        .enumerate()
-        .map(
-            |(thread_id, user2)| -> Result<String, Box<dyn std::error::Error + Send + Sync + 'static>> {
-                let shares_user1 = get_shares(&user1.id, true)?;
-                let shares_user2 = get_shares(&user2.id, false)?;
-
-                let share0 = merge_shares(shares_user1[0].clone(), shares_user2[0].clone())?;
-                let share1 = merge_shares(shares_user1[1].clone(), shares_user2[1].clone())?;
-                let share2 = merge_shares(shares_user1[2].clone(), shares_user2[2].clone())?;
-
-                match run_match(
-                    thread_id,
-                    [share0, share1, share2],
-                    parties_certs.clone(),
-                    program_artifact,
-                    constraint_system.clone(),
-                    recursive,
-                    has_zk,
-                    prover_crs.clone(),
-                    verifier_crs.clone(),
-                ) {
-                    Ok(_) => Ok(user2.id),
-                    Err(e) => Err(e),
-                }
-            },
-        )
-        .filter(|m| m.is_ok())
-        .collect::<Result<Vec<String>, _>>()?;
+    println!("ALL USERS: {:?}", all_users.len());
+
+    let pool = rayon::ThreadPoolBuilder::new().num_threads(5).build()?;
+
+    let verified_matches = pool.install(|| -> Result<Vec<String>, Box<dyn std::error::Error + Send + Sync + 'static>> {
+        all_users
+            .into_par_iter()
+            .enumerate()
+            .map(|(thread_id, user2)| -> Result<String, Box<dyn std::error::Error + Send + Sync + 'static>> {
+                            let shares_user1 = get_shares(&user1.id, true)?;
+                            let shares_user2 = get_shares(&user2.id, false)?;
+
+                            let share0 = merge_shares(shares_user1[0].clone(), shares_user2[0].clone())?;
+                            let share1 = merge_shares(shares_user1[1].clone(), shares_user2[1].clone())?;
+                            let share2 = merge_shares(shares_user1[2].clone(), shares_user2[2].clone())?;
+
+                            match run_match(
+                                thread_id,
+                                [share0, share1, share2],
+                                parties_certs.clone(),
+                                program_artifact,
+                                constraint_system.clone(),
+                                recursive,
+                                has_zk,
+                                prover_crs.clone(),
+                                verifier_crs.clone(),
+                            ) {
+                                Ok(_) => Ok(user2.id),
+                                Err(e) => Err(e),
+                            }
+                        },
+                    )
+                    .filter(|m| m.is_ok())
+                    .collect::<Result<Vec<String>, _>>()
+    })?;
 
     println!("verified matches: {verified_matches:?}");
 

web-app/src/pages/Matches.tsx

@@ -73,7 +73,7 @@ export default function Matches() {
         </h2>
         <div className="p-4 bg-gradient-to-r from-pink-50 to-purple-50 rounded-xl border border-pink-100 mb-6">
           <p className="text-gray-600 mb-2">
-            This might take up to 15 seconds - we&apos;re doing some heavy cryptographic lifting behind the scenes! 🔐
+            This might take up to 20 seconds - we&apos;re doing some heavy cryptographic lifting behind the scenes! 🔐
           </p>
           <p className="text-sm text-gray-500 mb-2">While you wait, here&apos;s what&apos;s happening:</p>
           <ul className="list-disc list-inside text-sm text-gray-500 mt-2 space-y-1">