diff --git a/bberg/src/circuit_builder.rs b/bberg/src/circuit_builder.rs index 37af26c80a..e16c8706fe 100644 --- a/bberg/src/circuit_builder.rs +++ b/bberg/src/circuit_builder.rs @@ -88,8 +88,9 @@ impl CircuitBuilder for BBFiles { ) }; let check_lookup_transformation = |lookup_name: &String| { + let lookup_name_upper = lookup_name.to_uppercase(); format!( - "if (!evaluate_logderivative.template operator()<{lookup_name}_relation>(\"{lookup_name}\")) {{ + "if (!evaluate_logderivative.template operator()<{lookup_name}_relation>(\"{lookup_name_upper}\")) {{ return false; }}" ) @@ -218,7 +219,7 @@ fn get_lookup_check_closure() -> String { } for (auto r : lookup_result) { if (r != 0) { - info(\"Lookup \", lookup_name, \" failed.\"); + throw_or_abort(format(\"Lookup \", lookup_name, \" failed.\")); return false; } } diff --git a/bberg/src/lookup_builder.rs b/bberg/src/lookup_builder.rs index 933da9c5b7..e70b864efd 100644 --- a/bberg/src/lookup_builder.rs +++ b/bberg/src/lookup_builder.rs @@ -63,8 +63,11 @@ impl LookupBuilder for BBFiles { let new_lookups = lookups .iter() .map(|lookup| Lookup { - attribute: lookup.attribute.clone(), - counts_poly: format!("{}_counts", lookup.attribute.clone().unwrap()), + attribute: lookup.attribute.clone().map(|att| att.to_lowercase()), + counts_poly: format!( + "{}_counts", + lookup.attribute.clone().unwrap().to_lowercase() + ), left: get_lookup_side(&lookup.left), right: get_lookup_side(&lookup.right), }) diff --git a/bberg/src/permutation_builder.rs b/bberg/src/permutation_builder.rs index 656eb244fe..6cc00db960 100644 --- a/bberg/src/permutation_builder.rs +++ b/bberg/src/permutation_builder.rs @@ -59,7 +59,7 @@ impl PermutationBuilder for BBFiles { let new_perms = perms .iter() .map(|perm| Permutation { - attribute: perm.attribute.clone(), + attribute: perm.attribute.clone().map(|att| att.to_lowercase()), left: get_perm_side(&perm.left), right: get_perm_side(&perm.right), }) @@ -129,9 +129,17 @@ fn create_permutation_settings_file(permutation: &Permutation) -> String { .expect("Inverse column name must be provided using attribute syntax"); // This also will need to work for both sides of this ! - let lhs_selector = permutation.left.selector.clone().expect("At least one selector must be provided"); + let lhs_selector = permutation + .left + .selector + .clone() + .expect("At least one selector must be provided"); // If a rhs selector is not present, then we use the rhs selector -- TODO(md): maybe we want the default to be always on? - let rhs_selector = permutation.right.selector.clone().unwrap_or(lhs_selector.clone()); + let rhs_selector = permutation + .right + .selector + .clone() + .unwrap_or(lhs_selector.clone()); let lhs_cols = permutation.left.cols.clone(); let rhs_cols = permutation.right.cols.clone();