migrate from anyhow to thiserror (#190). pending polish error msgs

Author: arnaucube

Cargo.toml

@@ -17,6 +17,7 @@ dyn-clone = "1.0.18"
 log = "0.4"
 env_logger = "0.11"
 lazy_static = "1.5.0"
+thiserror = { version = "2.0.12" }
 # enabled by features:
 plonky2 = { git = "https://github.com/0xPolygonZero/plonky2", optional = true }
 serde = "1.0.219"

src/backends/plonky2/circuits/common.rs

@@ -2,7 +2,6 @@
 
 use std::{array, iter};
 
-use anyhow::Result;
 use plonky2::{
     field::{
         extension::Extendable,
@@ -27,6 +26,7 @@ use crate::{
         EMPTY_VALUE, F, HASH_SIZE, OPERATION_ARG_F_LEN, OPERATION_AUX_F_LEN, STATEMENT_ARG_F_LEN,
         VALUE_SIZE,
     },
+    Result,
 };
 
 pub const CODE_SIZE: usize = HASH_SIZE + 2;
@@ -75,7 +75,7 @@ impl StatementArgTarget {
         params: &Params,
         arg: &StatementArg,
     ) -> Result<()> {
-        pw.set_target_arr(&self.elements, &arg.to_fields(params))
+        Ok(pw.set_target_arr(&self.elements, &arg.to_fields(params))?)
     }
 
     fn new(first: ValueTarget, second: ValueTarget) -> Self {

src/backends/plonky2/circuits/mainpod.rs

@@ -1,4 +1,3 @@
-use anyhow::Result;
 use itertools::zip_eq;
 use plonky2::{
     hash::{hash_types::HashOutTarget, poseidon::PoseidonHash},
@@ -26,6 +25,7 @@ use crate::{
         AnchoredKey, NativeOperation, NativePredicate, Params, PodType, Statement, StatementArg,
         ToFields, Value, F, KEY_TYPE, SELF, VALUE_SIZE,
     },
+    Result,
 };
 
 //

src/backends/plonky2/circuits/signedpod.rs

@@ -1,6 +1,5 @@
 use std::iter;
 
-use anyhow::Result;
 use itertools::Itertools;
 use plonky2::{
     hash::hash_types::{HashOut, HashOutTarget},
@@ -27,6 +26,7 @@ use crate::{
         hash_str, Key, NativePredicate, Params, PodType, Predicate, RawValue, ToFields, Value, F,
         KEY_SIGNER, KEY_TYPE, SELF,
     },
+    Result,
 };
 
 pub struct SignedPodVerifyGadget {

src/backends/plonky2/mainpod/mod.rs

@@ -2,7 +2,6 @@ pub mod operation;
 pub mod statement;
 use std::any::Any;
 
-use anyhow::{anyhow, Result};
 use itertools::Itertools;
 pub use operation::*;
 use plonky2::{
@@ -23,9 +22,11 @@ use crate::{
         signedpod::SignedPod,
     },
     middleware::{
-        self, AnchoredKey, Hash, MainPodInputs, NativeOperation, NonePod, OperationType, Params,
-        Pod, PodId, PodProver, PodType, StatementArg, ToFields, F, KEY_TYPE, SELF,
+        self, error::MiddlewareError, AnchoredKey, Hash, MainPodInputs, NativeOperation, NonePod,
+        OperationType, Params, Pod, PodId, PodProver, PodType, StatementArg, ToFields, F, KEY_TYPE,
+        SELF,
     },
+    Error, Result,
 };
 
 /// Hash a list of public statements to derive the PodId
@@ -72,11 +73,11 @@ pub(crate) fn extract_merkle_proofs(
         })
         .collect::<Result<Vec<_>>>()?;
     if merkle_proofs.len() > params.max_merkle_proofs {
-        Err(anyhow!(
+        Err(Error::Custom(format!(
             "The number of required Merkle proofs ({}) exceeds the maximum number ({}).",
             merkle_proofs.len(),
             params.max_merkle_proofs
-        ))
+        )))
     } else {
         fill_pad(
             &mut merkle_proofs,
@@ -98,10 +99,10 @@ fn find_op_arg(statements: &[Statement], op_arg: &middleware::Statement) -> Resu
                 (&middleware::Statement::try_from(s.clone()).ok()? == op_arg).then_some(i)
             })
             .map(OperationArg::Index)
-            .ok_or(anyhow!(
+            .ok_or(Error::Custom(format!(
                 "Statement corresponding to op arg {} not found",
                 op_arg
-            )),
+            ))),
     }
 }
 
@@ -122,10 +123,10 @@ fn find_op_aux(
                     .and_then(|mid_pf: merkletree::MerkleProof| (&mid_pf == pf_arg).then_some(i))
             })
             .map(OperationAux::MerkleProofIndex)
-            .ok_or(anyhow!(
+            .ok_or(Error::Custom(format!(
                 "Merkle proof corresponding to op arg {} not found",
                 op_aux
-            )),
+            ))),
     }
 }
 
@@ -384,11 +385,7 @@ impl Pod for MainPod {
         // 2. get the id out of the public statements
         let id: PodId = PodId(hash_statements(&self.public_statements, &self.params));
         if id != self.id {
-            return Err(anyhow!(
-                "id does not match, expected {}, computed {}",
-                self.id,
-                id
-            ));
+            return Err(Error::Middleware(MiddlewareError::IdNotEqual(self.id, id)));
         }
 
         // 1, 3, 4, 5 verification via the zkSNARK proof
@@ -402,7 +399,7 @@ impl Pod for MainPod {
 
         let data = builder.build::<C>();
         data.verify(self.proof.clone())
-            .map_err(|e| anyhow!("MainPod proof verification failure: {:?}", e))
+            .map_err(|e| Error::Custom(format!("MainPod proof verification failure: {:?}", e)))
     }
 
     fn id(&self) -> PodId {

src/backends/plonky2/mainpod/operation.rs

@@ -1,12 +1,12 @@
 use std::fmt;
 
-use anyhow::{anyhow, Result};
 use plonky2::field::types::Field;
 
 // use serde::{Deserialize, Serialize};
 use crate::{
     backends::plonky2::{mainpod::Statement, primitives::merkletree::MerkleClaimAndProof},
     middleware::{self, OperationType, Params, ToFields, F},
+    Error, Result,
 };
 
 #[derive(Clone, Debug, PartialEq)]
@@ -78,7 +78,7 @@ impl Operation {
             OperationAux::MerkleProofIndex(i) => merkle_proofs
                 .get(i)
                 .cloned()
-                .ok_or(anyhow!("Missing Merkle proof index {}", i))
+                .ok_or(Error::Custom(format!("Missing Merkle proof index {}", i)))
                 .and_then(|mp| {
                     mp.try_into()
                         .map(crate::middleware::OperationAux::MerkleProof)

src/backends/plonky2/mainpod/statement.rs

@@ -1,10 +1,9 @@
 use std::fmt;
 
-use anyhow::{anyhow, Result};
-
 // use serde::{Deserialize, Serialize};
-use crate::middleware::{
-    self, NativePredicate, Params, Predicate, StatementArg, ToFields, WildcardValue,
+use crate::{
+    middleware::{self, NativePredicate, Params, Predicate, StatementArg, ToFields, WildcardValue},
+    Error, Result,
 };
 
 #[derive(Clone, Debug, PartialEq)]
@@ -36,7 +35,7 @@ impl ToFields for Statement {
 }
 
 impl TryFrom<Statement> for middleware::Statement {
-    type Error = anyhow::Error;
+    type Error = Error;
     fn try_from(s: Statement) -> Result<Self> {
         type S = middleware::Statement;
         type NP = NativePredicate;
@@ -78,7 +77,10 @@ impl TryFrom<Statement> for middleware::Statement {
                 (NP::MaxOf, (Some(SA::Key(ak1)), Some(SA::Key(ak2)), Some(SA::Key(ak3))), 3) => {
                     S::MaxOf(ak1, ak2, ak3)
                 }
-                _ => Err(anyhow!("Ill-formed statement expression {:?}", s))?,
+                _ => Err(Error::Custom(format!(
+                    "Ill-formed statement expression {:?}",
+                    s
+                )))?,
             },
             Predicate::Custom(cpr) => {
                 let vs: Vec<WildcardValue> = proper_args

src/backends/plonky2/mock/mainpod.rs

@@ -4,7 +4,7 @@
 
 use std::{any::Any, fmt};
 
-use anyhow::{anyhow, Result};
+// use base64::prelude::*;
 
 // use base64::prelude::*;
 // use serde::{Deserialize, Serialize};
@@ -21,6 +21,7 @@ use crate::{
         self, hash_str, AnchoredKey, MainPodInputs, NativePredicate, Params, Pod, PodId, PodProver,
         Predicate, StatementArg, KEY_TYPE, SELF,
     },
+    Error, Result,
 };
 
 pub struct MockProver {}
@@ -168,9 +169,9 @@ impl MockMainPod {
 
     // pub fn deserialize(serialized: String) -> Result<Self> {
     //     let proof = String::from_utf8(BASE64_STANDARD.decode(&serialized)?)
-    //         .map_err(|e| anyhow::anyhow!("Invalid base64 encoding: {}", e))?;
+    //         .map_err(|e| Error::Custom(format!("Invalid base64 encoding: {}", e)))?;
     //     let pod: MockMainPod = serde_json::from_str(&proof)
-    //         .map_err(|e| anyhow::anyhow!("Failed to parse proof: {}", e))?;
+    //         .map_err(|e| Error::Custom(format!("Failed to parse proof: {}", e)))?;
 
     //     Ok(pod)
     // }
@@ -245,18 +246,16 @@ impl Pod for MockMainPod {
             .collect::<Result<Vec<_>>>()
             .unwrap();
         if !ids_match {
-            return Err(anyhow!("Verification failed: POD ID is incorrect."));
+            return Err(Error::PodIdInvalid);
         }
         if !has_type_statement {
-            return Err(anyhow!(
-                "Verification failed: POD does not have type statement."
-            ));
+            return Err(Error::NotTypeStatement);
         }
         if !value_ofs_unique {
-            return Err(anyhow!("Verification failed: Repeated ValueOf"));
+            return Err(Error::RepeatedValueOf);
         }
         if !statement_check.iter().all(|b| *b) {
-            return Err(anyhow!("Verification failed: Statement did not check."));
+            return Err(Error::StatementNotCheck);
         }
         Ok(())
     }