Improve single fixed query check

privacy-scaling-explorations · Jul 21, 2024 · 4b077b2 · 4b077b2
1 parent f453930
commit 4b077b2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/plonkish/backend/halo2.rs b/src/plonkish/backend/halo2.rs
@@ -232,6 +232,7 @@ impl<F: PrimeField + From<u64> + Hash> ChiquitoHalo2<F> {
             for expr in &lookup.exprs {
                 let dest = &expr.1;
                 if dest.involves(column) {
+                    // The lookup destination may involve this column, but not be a single query
                     has_only_single_queries = matches!(dest, PolyExpr::Query((_, _, _), _));
                 }
             }
@@ -269,7 +270,9 @@ impl<F: PrimeField + From<u64> + Hash> ChiquitoHalo2<F> {
             for (idx, (_, dest)) in lookup.exprs.iter().enumerate() {
                 match dest {
                     PolyExpr::Query((column, _, _), _) => {
-                        if column.ctype == cFixed || column.ctype == Halo2Fixed {
+                        if column.ctype == cFixed
+                            || column.ctype == Halo2Fixed && self.has_single_fixed_query(column)
+                        {
                             single_fixed_queries.push((
                                 lookup.exprs[idx].clone().0,
                                 // Get the corresponding TableColumn