return partial matches regardless of final matches

worldcoin · Oct 28, 2024 · 6d6097b · 6d6097b
1 parent ea28066
commit 6d6097b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/deploy/stage/common-values-iris-mpc.yaml b/deploy/stage/common-values-iris-mpc.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:ee89ea0b0f1358d69ffbbf730b5ae427f7361153"
+image: "ghcr.io/worldcoin/iris-mpc:c864d26668dcc5f1f86aba50a74563d9922a839f"
 
 environment: stage
 replicaCount: 1

diff --git a/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml
@@ -94,6 +94,9 @@ env:
   - name: SMPC__SERVICE__METRICS__PREFIX
     value: "smpcv2-0"
 
+  - name: SMPC__RETURN_PARTIAL_MATCHES
+    value: "true"
+
 initContainer:
   enabled: true
   image: "amazon/aws-cli:2.17.62"

diff --git a/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml
@@ -94,6 +94,9 @@ env:
   - name: SMPC__SERVICE__METRICS__PREFIX
     value: "smpcv2-1"
 
+  - name: SMPC__RETURN_PARTIAL_MATCHES
+    value: "true"
+
 initContainer:
   enabled: true
   image: "amazon/aws-cli:2.17.62"

diff --git a/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml
@@ -94,6 +94,9 @@ env:
   - name: SMPC__SERVICE__METRICS__PREFIX
     value: "smpcv2-2"
 
+  - name: SMPC__RETURN_PARTIAL_MATCHES
+    value: "true"
+
 initContainer:
   enabled: true
   image: "amazon/aws-cli:2.17.62"

diff --git a/iris-mpc/src/bin/server.rs b/iris-mpc/src/bin/server.rs
@@ -830,23 +830,23 @@ async fn server_main(config: Config) -> eyre::Result<()> {
                             true => Some(match_ids[i].iter().map(|x| x + 1).collect::<Vec<_>>()),
                             false => None,
                         },
-                        match matches[i] {
-                            true => Some(
+                        match partial_match_ids_left[i].is_empty() {
+                            false => Some(
                                 partial_match_ids_left[i]
                                     .iter()
                                     .map(|x| x + 1)
                                     .collect::<Vec<_>>(),
                             ),
-                            false => None,
+                            true => None,
                         },
-                        match matches[i] {
-                            true => Some(
+                        match partial_match_ids_right[i].is_empty() {
+                            false => Some(
                                 partial_match_ids_right[i]
                                     .iter()
                                     .map(|x| x + 1)
                                     .collect::<Vec<_>>(),
                             ),
-                            false => None,
+                            true => None,
                         },
                     );