Merge branch 'master' into dw/reactivate-completeness-nextest-config

.config/nextest.toml

@@ -136,4 +136,4 @@ test-threads = "num-cpus"
 filter = "test(completeness)"
 threads-required = 2
 # The CI is slower. On a consumer laptop, completeness tests take up to 3m.
-slow-timeout = "5m"
+slow-timeout = "5m"

.github/workflows/rust.yml

@@ -169,10 +169,7 @@ jobs:
           # FIXME: update to 0.9.68 when we get rid of 1.71 and 1.72.
           cargo install cargo-nextest@=0.9.67 --locked
 
-      # Completeness tests take a lot of CPU/RAM. It happened in the past that
-      # the CI was failing only on some of them, even though they were correct
-      # FIXME: run the completeness tests
-      - name: Test everything, except tests related to completeness
+      - name: Test everything
         run: |
           eval $(opam env)
           cargo nextest run --all-features --release --profile ci

msm/src/fec/mod.rs

@@ -19,7 +19,7 @@ mod tests {
     use ark_ec::AffineCurve;
     use ark_ff::UniformRand;
     use rand::{CryptoRng, RngCore};
-    use std::collections::BTreeMap;
+    use std::collections::{BTreeMap, HashMap};
 
     type FECWitnessBuilderEnv = WitnessBuilderEnv<
         Fp,
@@ -83,6 +83,56 @@ mod tests {
         build_fec_addition_circuit(&mut rng, 1 << 4);
     }
 
+    #[test]
+    pub fn test_regression_relation_constraints_fec() {
+        let mut constraint_env = ConstraintBuilderEnv::<Fp, LookupTable<Ff1>>::create();
+        constrain_ec_addition::<Fp, Ff1, _>(&mut constraint_env);
+        let constraints = constraint_env.get_relation_constraints();
+
+        let mut constraints_degrees = HashMap::new();
+
+        assert_eq!(constraints.len(), 24);
+
+        {
+            constraints.iter().for_each(|c| {
+                let degree = c.degree(1, 0);
+                *constraints_degrees.entry(degree).or_insert(0) += 1;
+            });
+
+            assert_eq!(constraints_degrees.get(&1), None);
+            assert_eq!(constraints_degrees.get(&2), Some(&3));
+            assert_eq!(constraints_degrees.get(&3), Some(&21));
+
+            assert!(constraints.iter().map(|c| c.degree(1, 0)).max() <= Some(3));
+        }
+    }
+
+    #[test]
+    pub fn test_regression_constraints_fec() {
+        let mut constraint_env = ConstraintBuilderEnv::<Fp, LookupTable<Ff1>>::create();
+        constrain_ec_addition::<Fp, Ff1, _>(&mut constraint_env);
+        let constraints = constraint_env.get_constraints();
+
+        let mut constraints_degrees = HashMap::new();
+
+        assert_eq!(constraints.len(), 63);
+
+        {
+            constraints.iter().for_each(|c| {
+                let degree = c.degree(1, 0);
+                *constraints_degrees.entry(degree).or_insert(0) += 1;
+            });
+
+            assert_eq!(constraints_degrees.get(&1), Some(&1));
+            assert_eq!(constraints_degrees.get(&2), Some(&5));
+            assert_eq!(constraints_degrees.get(&3), Some(&21));
+            assert_eq!(constraints_degrees.get(&4), None);
+            assert_eq!(constraints_degrees.get(&5), Some(&2));
+            assert_eq!(constraints_degrees.get(&6), None);
+            assert_eq!(constraints_degrees.get(&7), Some(&34));
+        }
+    }
+
     #[test]
     pub fn test_fec_completeness() {
         let mut rng = o1_utils::tests::make_test_rng(None);