fix: Remove unwraps inside verify_gnark_proof (issue 1830) (#1834)

succinctlabs · Dec 3, 2024 · 013c24e · 013c24e
1 parent a3de183
commit 013c24e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/crates/verifier/src/groth16/mod.rs b/crates/verifier/src/groth16/mod.rs
@@ -97,11 +97,14 @@ impl Groth16Verifier {
         public_inputs: &[[u8; 32]],
         groth16_vk: &[u8],
     ) -> Result<(), Groth16Error> {
-        let proof = load_groth16_proof_from_bytes(proof).unwrap();
-        let groth16_vk = load_groth16_verifying_key_from_bytes(groth16_vk).unwrap();
+        let proof = load_groth16_proof_from_bytes(proof)?;
+        let groth16_vk = load_groth16_verifying_key_from_bytes(groth16_vk)?;
 
-        let public_inputs =
-            public_inputs.iter().map(|input| Fr::from_slice(input).unwrap()).collect::<Vec<_>>();
+        let public_inputs = public_inputs
+            .iter()
+            .map(|input| Fr::from_slice(input))
+            .collect::<Result<Vec<_>, bn::FieldError>>()
+            .map_err(|_| Groth16Error::GeneralError(Error::InvalidData))?;
         verify_groth16_algebraic(&groth16_vk, &proof, &public_inputs)
     }
 }
diff --git a/crates/verifier/src/plonk/mod.rs b/crates/verifier/src/plonk/mod.rs
@@ -99,11 +99,14 @@ impl PlonkVerifier {
         public_inputs: &[[u8; 32]],
         plonk_vk: &[u8],
     ) -> Result<(), PlonkError> {
-        let plonk_vk = load_plonk_verifying_key_from_bytes(plonk_vk).unwrap();
-        let proof = load_plonk_proof_from_bytes(proof, plonk_vk.qcp.len()).unwrap();
+        let plonk_vk = load_plonk_verifying_key_from_bytes(plonk_vk)?;
+        let proof = load_plonk_proof_from_bytes(proof, plonk_vk.qcp.len())?;
 
-        let public_inputs =
-            public_inputs.iter().map(|input| Fr::from_slice(input).unwrap()).collect::<Vec<_>>();
+        let public_inputs = public_inputs
+            .iter()
+            .map(|input| Fr::from_slice(input))
+            .collect::<Result<Vec<_>, bn::FieldError>>()
+            .map_err(|_| PlonkError::GeneralError(Error::InvalidData))?;
         verify_plonk_algebraic(&plonk_vk, &proof, &public_inputs)
     }
 }