fix tests

Author: prajwolrg

crates/risc0/proofs/fibonacci_risc0_0963493f27db6efac281ea2900ff4c611a93703cb9109dbd2231484121d08384.proof.bin

@@ -26,36 +26,19 @@ pub fn verify_groth16(receipt: &ProofReceipt, verification_key: &[u8; 32]) -> Zk
         .map_err(|e| strata_zkvm::ZkVmError::ProofVerificationError(e.to_string()))
 }
 
-// #[cfg(test)]
-// mod tests {
-//     use risc0_zkvm::{serde::to_vec, Receipt};
-//     use strata_zkvm::Proof;
-
-//     use super::verify_groth16;
-//     #[test]
-//     fn test_groth16_verification() {
-//         let input: u32 = 1;
-
-//         // Note: This is generated in prover.rs
-//         let vk = [
-//             48, 77, 52, 1, 100, 95, 109, 135, 223, 56, 83, 146, 244, 21, 237, 63, 198, 105, 2,
-// 75,             135, 48, 52, 165, 178, 24, 200, 186, 174, 191, 212, 184,
-//         ];
-
-//         // Note: This is written in prover.rs
-//         let raw_proof = include_bytes!("../tests/proofs/proof-groth16.bin");
-
-//         let proof = Proof::new(raw_proof.to_vec());
-//         let receipt: Receipt = bincode::deserialize(proof.as_bytes()).unwrap();
-//         let seal = Proof::new(receipt.inner.groth16().unwrap().clone().seal);
-
-//         let public_params_raw: Vec<u8> = to_vec(&input)
-//             .unwrap()
-//             .clone()
-//             .into_iter()
-//             .flat_map(|x| x.to_le_bytes().to_vec()) // Convert each u32 to 4 u8 bytes
-//             .collect();
-//         let res = verify_groth16(&seal, &vk, &public_params_raw);
-//         assert!(res.is_ok());
-//     }
-// }
+#[cfg(test)]
+mod tests {
+    use strata_zkvm::ProofReceipt;
+
+    use super::verify_groth16;
+    #[test]
+    fn test_groth16_verification() {
+        let vk_hex = "0963493f27db6efac281ea2900ff4c611a93703cb9109dbd2231484121d08384";
+        let vk: [u8; 32] = hex::decode(vk_hex).unwrap().try_into().unwrap();
+        let proof_file = format!("./proofs/fibonacci_risc0_{}.proof.bin", vk_hex);
+
+        let receipt = ProofReceipt::load(proof_file).unwrap();
+        let res = verify_groth16(&receipt, &vk);
+        assert!(res.is_ok(), "groth16 proof verification must succeed");
+    }
+}

crates/risc0/src/groth16_verifier.rs

@@ -18,30 +18,20 @@ pub fn verify_groth16(receipt: &ProofReceipt, vkey_hash: &[u8; 32]) -> ZkVmResul
     .map_err(|e| ZkVmError::ProofVerificationError(e.to_string()))
 }
 
-// // NOTE: SP1 prover runs in release mode only; therefore run the tests on release mode only
-// #[cfg(test)]
-// mod tests {
-
-//     use sp1_sdk::SP1ProofWithPublicValues;
-//     use strata_primitives::buf::Buf32;
-
-//     use super::*;
-
-//     #[test]
-//     fn test_groth16_verification() {
-//         let sp1_vkey_hash = "0x00efb1120491119751e75bc55bc95b64d33f973ecf68fcf5cbff08506c5788f9";
-//         let vk_buf32: Buf32 = sp1_vkey_hash.parse().unwrap();
-//         let vk_hash_str = hex::encode(vk_buf32.as_bytes());
-//         let vk_hash_str = format!("0x{}", vk_hash_str);
-//         assert_eq!(sp1_vkey_hash, vk_hash_str);
-
-//         let sp1_proof_with_public_values =
-//             SP1ProofWithPublicValues::load("tests/proofs/proof-groth16.bin").unwrap();
-
-//         let proof = Proof::new(sp1_proof_with_public_values.bytes());
-//         let sp1_public_inputs = sp1_proof_with_public_values.public_values.to_vec();
-
-//         verify_groth16(&proof, &vk_buf32.0, &sp1_public_inputs)
-//             .expect("proof verification must succeed");
-//     }
-// }
+#[cfg(test)]
+mod tests {
+    use strata_zkvm::ProofReceipt;
+
+    use crate::verify_groth16;
+
+    #[test]
+    fn test_groth16_verification() {
+        let vk_hex = "00bf077c28baa685b0a9ec0b8d47eb51bc98f5c048f5aa386ea156fe24995a35";
+        let vk: [u8; 32] = hex::decode(vk_hex).unwrap().try_into().unwrap();
+        let proof_file = format!("./proofs/fibonacci_sp1_0x{}.proof.bin", vk_hex);
+
+        let receipt = ProofReceipt::load(proof_file).unwrap();
+        let res = verify_groth16(&receipt, &vk);
+        assert!(res.is_ok(), "groth16 proof verification must succeed");
+    }
+}

crates/sp1/proofs/fibonacci_sp1_0x00bf077c28baa685b0a9ec0b8d47eb51bc98f5c048f5aa386ea156fe24995a35.proof.bin

@@ -50,7 +50,7 @@ impl TryFrom<SP1ProofReceipt> for ProofReceipt {
     fn try_from(value: SP1ProofReceipt) -> Result<Self, Self::Error> {
         let sp1_receipt = value.as_ref();
 
-        // If there's a Groth16 representation, just re-use its bytes;
+        // If there's a Groth16 representation, just reuse its bytes;
         // otherwise, serialize the entire proof.
         let proof_bytes = match sp1_receipt.proof.clone().try_as_groth_16() {
             Some(_) => sp1_receipt.bytes(),

crates/sp1/src/groth16_verifier.rs

@@ -25,7 +25,7 @@ impl ZkVmProver for FibProver {
     type Output = i32;
 
     fn proof_type() -> strata_zkvm::ProofType {
-        ProofType::Core
+        ProofType::Groth16
     }
 
     fn prepare_input<'a, B>(input: &'a Self::Input) -> ZkVmInputResult<B::Input>