Use assert_satisfied instead of assert_satisfied_par

axiom-crypto/halo2#32
ChainSafe · Feb 2, 2024 · 1d47974 · 1d47974
1 parent 12f9cc4
commit 1d47974
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/lightclient-circuits/src/committee_update_circuit.rs b/lightclient-circuits/src/committee_update_circuit.rs
@@ -325,7 +325,7 @@ mod tests {
 
         let timer = start_timer!(|| "committee_update mock prover");
         let prover = MockProver::<Fr>::run(K, &circuit, instance).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
         end_timer!(timer);
     }
 

diff --git a/lightclient-circuits/src/gadget/crypto/builder.rs b/lightclient-circuits/src/gadget/crypto/builder.rs
@@ -37,7 +37,9 @@ pub struct SHAConfig<F: Field, CustomConfig: GateBuilderConfig<F>> {
 
 impl<F: Field, GateConfig: GateBuilderConfig<F>> SHAConfig<F, GateConfig> {
     pub fn configure(meta: &mut ConstraintSystem<F>, params: BaseCircuitParams) -> Self {
-        let base = BaseConfig::configure(meta, params.clone());
+        let usable_rows = (1 << params.k) - meta.minimum_rows();
+        let mut base = BaseConfig::configure(meta, params.clone());
+        base.set_usable_rows(usable_rows);
         let compression = GateConfig::configure(meta, params);
 
         Self { base, compression }

diff --git a/lightclient-circuits/src/sync_step_circuit.rs b/lightclient-circuits/src/sync_step_circuit.rs
@@ -488,7 +488,7 @@ mod tests {
 
         let timer = start_timer!(|| "sync_step mock prover");
         let prover = MockProver::<Fr>::run(K, &circuit, instance).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
         end_timer!(timer);
     }
 

diff --git a/lightclient-circuits/src/witness/rotation.rs b/lightclient-circuits/src/witness/rotation.rs
@@ -124,6 +124,6 @@ mod tests {
         .unwrap();
 
         let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
     }
 }
diff --git a/lightclient-circuits/src/witness/step.rs b/lightclient-circuits/src/witness/step.rs
@@ -152,6 +152,6 @@ mod tests {
         .unwrap();
 
         let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
     }
 }
diff --git a/lightclient-circuits/tests/step.rs b/lightclient-circuits/tests/step.rs
@@ -97,7 +97,7 @@
 //     let timer = start_timer!(|| "committee_update mock prover run");
 //     let prover =
 //         MockProver::<bn256::Fr>::run(K_ROTATION, &rotation_circuit, rotation_instance).unwrap();
-//     prover.assert_satisfied_par();
+//     prover.assert_satisfied();
 //     end_timer!(timer);
 
 //     let sync_circuit = mock_step_circuit(&sync_witness, K_SYNC, None);
@@ -106,7 +106,7 @@
 
 //     let timer = start_timer!(|| "sync_step mock prover run");
 //     let prover = MockProver::<bn256::Fr>::run(K_SYNC, &sync_circuit, instance).unwrap();
-//     prover.assert_satisfied_par();
+//     prover.assert_satisfied();
 //     end_timer!(timer);
 // }
 

diff --git a/preprocessor/src/lib.rs b/preprocessor/src/lib.rs
@@ -277,7 +277,7 @@ mod tests {
         .unwrap();
 
         let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
 
         const CONFIG_PATH: &str = "../lightclient-circuits/config/committee_update_testnet.json";
 
@@ -291,6 +291,6 @@ mod tests {
         .unwrap();
 
         let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
     }
 }
diff --git a/preprocessor/src/rotation.rs b/preprocessor/src/rotation.rs
@@ -141,7 +141,7 @@ mod tests {
         .unwrap();
 
         let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
     }
 
     #[tokio::test]

diff --git a/preprocessor/src/step.rs b/preprocessor/src/step.rs
@@ -192,7 +192,7 @@ mod tests {
         .unwrap();
 
         let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
-        prover.assert_satisfied_par();
+        prover.assert_satisfied();
     }
 
     #[tokio::test]