Merge branch 'dev' into bg/construct-graph-ptxt

Author: bgillesp

iris-mpc-cpu/src/execution/hawk_main/matching.rs

@@ -397,7 +397,7 @@ impl Step3 {
 ///
 /// LUC *OR* policy: "Local" irises match if either side matches.
 ///
-/// Intra-batch *OR* policy: match against requests before this request in the same batch.
+/// Intra-batch *AND* policy: match against requests before this request in the same batch.
 ///
 /// Partial matches: set `eyes: Only(Left)` or `eyes: Only(Right)`.
 ///
@@ -449,7 +449,7 @@ impl Filter {
     }
 
     fn intra_rule(&self, left: bool, right: bool) -> bool {
-        self.intra_batch && self.luc_rule(left, right)
+        self.intra_batch && self.search_rule(left, right)
     }
 }
 #[cfg(test)]
@@ -549,10 +549,10 @@ mod tests {
     #[test]
     fn test_intra_rule() {
         for x in [false, true] {
-            // Matching within a batch: OR rule.
-            assert_eq!(FILTER_INTRA.intra_rule(true, x), true);
-            assert_eq!(FILTER_INTRA.intra_rule(x, true), true);
-            assert_eq!(FILTER_INTRA.intra_rule(false, false), false);
+            // Matching within a batch: AND rule.
+            assert_eq!(FILTER_INTRA.intra_rule(false, x), false);
+            assert_eq!(FILTER_INTRA.intra_rule(x, false), false);
+            assert_eq!(FILTER_INTRA.intra_rule(true, true), true);
 
             // If intra-batch is not requested, always false.
             for y in [false, true] {