chore: merge errors (0xEigenLabs#146)

* chore: change curve naming to uppercase format (0xEigenLabs#142) * chore: merge error codes --------- Co-authored-by: ibmp33 <[email protected]>
SuccinctPaul · Oct 28, 2023 · add5003 · add5003
1 parent b998be6
commit add5003
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 53 deletions.
diff --git a/algebraic/Cargo.toml b/algebraic/Cargo.toml
@@ -29,6 +29,7 @@ num = { version = "0.4.0" }
 byteorder = "1"
 franklin-crypto = { git = "https://github.com/matter-labs/franklin-crypto", branch = "beta", features = [ "plonk" ], version = "0.0.5"}
 #franklin-crypto = { path = "../../franklin-crypto", features = [ "plonk" ], version = "0.0.5"}
+ff = {package="ff_ce" , version="0.11", features = ["derive"]}
 
 [dev-dependencies]
 env_logger = "0.10"

diff --git a/algebraic/src/errors.rs b/algebraic/src/errors.rs
@@ -1,3 +1,4 @@
+use crate::bellman_ce;
 use thiserror::Error;
 
 pub type Result<T> = std::result::Result<T, EigenError>;
@@ -35,7 +36,10 @@ pub enum EigenError {
     FRIVerifierFailed,
 
     #[error("Fr::from_expr error")]
-    PFDecodeError(#[from] crate::ff::PrimeFieldDecodingError),
+    PFDecodeError(#[from] ff::PrimeFieldDecodingError),
+
+    #[error("Fr::from_expr error")]
+    FrankinCryptoPFDecodeError(#[from] bellman_ce::PrimeFieldDecodingError),
 
     #[error("WasmRuntime error, exit `{0}`")]
     WasmerRuntimeError(#[from] wasmer::RuntimeError),

diff --git a/algebraic/src/witness/memory.rs b/algebraic/src/witness/memory.rs
@@ -1,8 +1,7 @@
 //! Safe-ish interface for reading and writing specific types to the WASM runtime's memory,
 //! modified from ark-circom
-use crate::bellman_ce::{Field, PrimeField, PrimeFieldRepr, ScalarEngine};
+use crate::bellman_ce::{to_hex, Field, PrimeField, PrimeFieldRepr, ScalarEngine};
 use crate::errors::Result;
-use crate::to_hex;
 use num_bigint::{BigInt, BigUint};
 use num_traits::Num;
 use num_traits::ToPrimitive;

diff --git a/starky/src/errors.rs b/starky/src/errors.rs
diff --git a/starky/src/lib.rs b/starky/src/lib.rs
@@ -1,7 +1,5 @@
 #![allow(clippy::needless_range_loop)]
 #![allow(dead_code)]
-
-pub mod errors;
 pub mod polsarray;
 mod polutils;
 pub mod stark_verifier_circom;
@@ -80,3 +78,5 @@ extern crate serde_json;
 extern crate ff;
 extern crate lazy_static;
 extern crate log;
+
+pub use algebraic::errors;