Move circuit test data to tests/circuit_reference_data folder, fix na…

…mes of the test data files to follow the same convention: .proof.bin for proof tests, .vk.txt for verifying key/layout tests
QED-it · May 15, 2024 · 92922be · 92922be
1 parent 3324348
commit 92922be
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 17 deletions.
diff --git a/halo2_gadgets/src/ecc.rs b/halo2_gadgets/src/ecc.rs
@@ -914,13 +914,13 @@ pub(crate) mod tests {
     #[test]
     fn fixed_verification_key_test() {
         let circuit = MyCircuit { test_errors: false };
-        fixed_verification_key_test_with_circuit(&circuit, "vk_ecc_chip_0");
+        fixed_verification_key_test_with_circuit(&circuit, "ecc_chip");
     }
 
     #[test]
     fn serialized_proof_test_case() {
         let circuit = MyCircuit { test_errors: false };
-        serialized_proof_test_case_with_circuit(circuit, "circuit_proof_test_case_ecc");
+        serialized_proof_test_case_with_circuit(circuit, "ecc_chip");
     }
 
     #[cfg(feature = "test-dev-graph")]

diff --git a/halo2_gadgets/src/sinsemilla.rs b/halo2_gadgets/src/sinsemilla.rs
@@ -747,13 +747,13 @@ pub(crate) mod tests {
     #[test]
     fn fixed_verification_key_test() {
         let circuit = MyCircuit {};
-        fixed_verification_key_test_with_circuit(&circuit, "vk_sinsemilla_chip_0");
+        fixed_verification_key_test_with_circuit(&circuit, "sinsemilla_chip");
     }
 
     #[test]
     fn serialized_proof_test_case() {
         let circuit = MyCircuit {};
-        serialized_proof_test_case_with_circuit(circuit, "circuit_proof_test_case_sinsemilla");
+        serialized_proof_test_case_with_circuit(circuit, "sinsemilla_chip");
     }
 
     #[cfg(feature = "test-dev-graph")]

diff --git a/halo2_gadgets/src/sinsemilla/merkle.rs b/halo2_gadgets/src/sinsemilla/merkle.rs
@@ -393,13 +393,13 @@ pub mod tests {
     #[test]
     fn fixed_verification_key_test() {
         let circuit = generate_circuit();
-        fixed_verification_key_test_with_circuit(&circuit, "vk_merkle_chip_0");
+        fixed_verification_key_test_with_circuit(&circuit, "merkle_chip");
     }
 
     #[test]
     fn serialized_proof_test_case() {
         let circuit = generate_circuit();
-        serialized_proof_test_case_with_circuit(circuit, "circuit_proof_test_case_merkle");
+        serialized_proof_test_case_with_circuit(circuit, "merkle_chip");
     }
 
     #[cfg(feature = "test-dev-graph")]

diff --git a/...src/tests/circuit_proof_test_case_ecc.bin → ...circuit_reference_data/ecc_chip.proof.bin b/...src/tests/circuit_proof_test_case_ecc.bin → ...circuit_reference_data/ecc_chip.proof.bin
diff --git a/halo2_gadgets/src/tests/vk_ecc_chip_0 → ...ts/circuit_reference_data/ecc_chip.vk.txt b/halo2_gadgets/src/tests/vk_ecc_chip_0 → ...ts/circuit_reference_data/ecc_chip.vk.txt
diff --git a/...it_proof_test_case_lookup_range_check.bin → ...ference_data/lookup_range_check.proof.bin b/...it_proof_test_case_lookup_range_check.bin → ...ference_data/lookup_range_check.proof.bin
diff --git a/...gadgets/src/tests/vk_lookup_range_check_0 → ..._reference_data/lookup_range_check.vk.txt b/...gadgets/src/tests/vk_lookup_range_check_0 → ..._reference_data/lookup_range_check.vk.txt
diff --git a/.../tests/circuit_proof_test_case_merkle.bin → ...cuit_reference_data/merkle_chip.proof.bin b/.../tests/circuit_proof_test_case_merkle.bin → ...cuit_reference_data/merkle_chip.proof.bin
diff --git a/halo2_gadgets/src/tests/vk_merkle_chip_0 → ...circuit_reference_data/merkle_chip.vk.txt b/halo2_gadgets/src/tests/vk_merkle_chip_0 → ...circuit_reference_data/merkle_chip.vk.txt
diff --git a/...t_proof_test_case_short_range_check_0.bin → ...erence_data/short_range_check_0.proof.bin b/...t_proof_test_case_short_range_check_0.bin → ...erence_data/short_range_check_0.proof.bin
diff --git a/..._gadgets/src/tests/vk_short_range_check_0 → ...reference_data/short_range_check_0.vk.txt b/..._gadgets/src/tests/vk_short_range_check_0 → ...reference_data/short_range_check_0.vk.txt
diff --git a/...t_proof_test_case_short_range_check_1.bin → ...erence_data/short_range_check_1.proof.bin b/...t_proof_test_case_short_range_check_1.bin → ...erence_data/short_range_check_1.proof.bin
diff --git a/..._gadgets/src/tests/vk_short_range_check_1 → ...reference_data/short_range_check_1.vk.txt b/..._gadgets/src/tests/vk_short_range_check_1 → ...reference_data/short_range_check_1.vk.txt
diff --git a/...t_proof_test_case_short_range_check_2.bin → ...erence_data/short_range_check_2.proof.bin b/...t_proof_test_case_short_range_check_2.bin → ...erence_data/short_range_check_2.proof.bin
diff --git a/..._gadgets/src/tests/vk_short_range_check_2 → ...reference_data/short_range_check_2.vk.txt b/..._gadgets/src/tests/vk_short_range_check_2 → ...reference_data/short_range_check_2.vk.txt
diff --git a/...ts/circuit_proof_test_case_sinsemilla.bin → ..._reference_data/sinsemilla_chip.proof.bin b/...ts/circuit_proof_test_case_sinsemilla.bin → ..._reference_data/sinsemilla_chip.proof.bin
diff --git a/halo2_gadgets/src/tests/vk_sinsemilla_chip_0 → ...uit_reference_data/sinsemilla_chip.vk.txt b/halo2_gadgets/src/tests/vk_sinsemilla_chip_0 → ...uit_reference_data/sinsemilla_chip.vk.txt
diff --git a/halo2_gadgets/src/tests/test_utils.rs b/halo2_gadgets/src/tests/test_utils.rs
@@ -20,7 +20,7 @@ use halo2_proofs::{
     transcript::{Blake2bRead, Blake2bWrite},
 };
 
-const TEST_DATA_DIR: &str = "src/tests";
+const TEST_DATA_DIR: &str = "src/tests/circuit_reference_data";
 
 /// A proof structure
 #[derive(Clone, Debug)]
@@ -70,7 +70,9 @@ pub(crate) fn fixed_verification_key_test_with_circuit<C: Circuit<pallas::Base>>
     circuit: &C,
     file_name: &str,
 ) {
-    let full_file_name = Path::new(TEST_DATA_DIR).join(file_name);
+    let full_file_name = Path::new(TEST_DATA_DIR)
+        .join(file_name)
+        .with_extension("vk.txt");
 
     // Setup phase: generate parameters, vk for the circuit.
     let params: Params<Affine> = Params::new(11);
@@ -114,7 +116,7 @@ pub(crate) fn serialized_proof_test_case_with_circuit<C: Circuit<pallas::Base>>(
 ) {
     let full_file_name = Path::new(TEST_DATA_DIR)
         .join(file_name)
-        .with_extension("bin");
+        .with_extension("proof.bin");
 
     // Setup phase: generate parameters, vk for the circuit.
     let params: Params<Affine> = Params::new(11);

diff --git a/halo2_gadgets/src/utilities/lookup_range_check.rs b/halo2_gadgets/src/utilities/lookup_range_check.rs
@@ -574,11 +574,11 @@ mod tests {
             let prover = MockProver::<pallas::Base>::run(11, &circuit, vec![]).unwrap();
             assert_eq!(prover.verify(), Ok(()));
 
-            fixed_verification_key_test_with_circuit(&circuit, "vk_lookup_range_check_0");
+            fixed_verification_key_test_with_circuit(&circuit, "lookup_range_check");
 
             serialized_proof_test_case_with_circuit(
                 circuit,
-                "circuit_proof_test_case_lookup_range_check",
+                "lookup_range_check",
             );
         }
     }
@@ -639,11 +639,11 @@ mod tests {
             let prover = MockProver::<pallas::Base>::run(11, &circuit, vec![]).unwrap();
             assert_eq!(prover.verify(), Ok(()));
 
-            fixed_verification_key_test_with_circuit(&circuit, "vk_short_range_check_0");
+            fixed_verification_key_test_with_circuit(&circuit, "short_range_check_0");
 
             serialized_proof_test_case_with_circuit(
                 circuit,
-                "circuit_proof_test_case_short_range_check_0",
+                "short_range_check_0",
             );
         }
 
@@ -656,11 +656,11 @@ mod tests {
             let prover = MockProver::<pallas::Base>::run(11, &circuit, vec![]).unwrap();
             assert_eq!(prover.verify(), Ok(()));
 
-            fixed_verification_key_test_with_circuit(&circuit, "vk_short_range_check_1");
+            fixed_verification_key_test_with_circuit(&circuit, "short_range_check_1");
 
             serialized_proof_test_case_with_circuit(
                 circuit,
-                "circuit_proof_test_case_short_range_check_1",
+                "short_range_check_1",
             );
         }
 
@@ -673,11 +673,11 @@ mod tests {
             let prover = MockProver::<pallas::Base>::run(11, &circuit, vec![]).unwrap();
             assert_eq!(prover.verify(), Ok(()));
 
-            fixed_verification_key_test_with_circuit(&circuit, "vk_short_range_check_2");
+            fixed_verification_key_test_with_circuit(&circuit, "short_range_check_2");
 
             serialized_proof_test_case_with_circuit(
                 circuit,
-                "circuit_proof_test_case_short_range_check_2",
+                "short_range_check_2",
             );
         }