logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-08 16:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use error instead of panicking in FromStr

Browse Source
This commit is contained in:
wborgeaud 2023-01-13 15:26:53 +01:00
parent be7a489c6e
commit a158effe4d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
evm/src/generation/prover_input.rs
View File

@ -1,5 +1,6 @@
use std::str::FromStr; use std::str::FromStr;
use anyhow::{bail, Error};
use ethereum_types::{BigEndianHash, H256, U256}; use ethereum_types::{BigEndianHash, H256, U256};
use plonky2::field::types::Field; use plonky2::field::types::Field;
@ -101,7 +102,7 @@ enum FieldOp {
} }
impl FromStr for EvmField { impl FromStr for EvmField {
type Err = (); type Err = Error;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
Ok(match s { Ok(match s {
@ -109,19 +110,19 @@ impl FromStr for EvmField {
"bn254_scalar" => Bn254Scalar, "bn254_scalar" => Bn254Scalar,
"secp256k1_base" => Secp256k1Base, "secp256k1_base" => Secp256k1Base,
"secp256k1_scalar" => Secp256k1Scalar, "secp256k1_scalar" => Secp256k1Scalar,
_ => panic!("Unrecognized field."), _ => bail!("Unrecognized field."),
}) })
} }
} }
impl FromStr for FieldOp { impl FromStr for FieldOp {
type Err = (); type Err = Error;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
Ok(match s { Ok(match s {
"inverse" => Inverse, "inverse" => Inverse,
"sqrt" => Sqrt, "sqrt" => Sqrt,
_ => panic!("Unrecognized field operation."), _ => bail!("Unrecognized field operation."),
}) })
} }
} }