Skip to content

refactor: Simplify error type in SuperNova module #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huitseeker merged 1 commit into from
Sep 26, 2023
Merged

refactor: Simplify error type in SuperNova module #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/supernova/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::errors::NovaError;
pub enum SuperNovaError {
/// Nova error
#[error("NovaError")]
NovaError(NovaError),
NovaError(#[from] NovaError),
/// missig commitment key
#[error("MissingCK")]
MissingCK,
Expand Down
38 changes: 12 additions & 26 deletions src/supernova/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,7 @@ where
let ck_secondary = pp.ck_secondary.as_ref().ok_or(SuperNovaError::MissingCK)?;

if z0_primary.len() != pp.F_arity_primary || z0_secondary.len() != pp.F_arity_secondary {
return Err(SuperNovaError::NovaError(
NovaError::InvalidStepOutputLength,
));
return Err(NovaError::InvalidStepOutputLength.into());
}

// base case for the primary
Expand Down Expand Up @@ -414,18 +412,16 @@ where
let (zi_primary_pc_next, zi_primary) =
circuit_primary.synthesize(&mut cs_primary).map_err(|err| {
debug!("err {:?}", err);
SuperNovaError::NovaError(NovaError::SynthesisError)
NovaError::SynthesisError
})?;
if zi_primary.len() != pp.F_arity_primary {
return Err(SuperNovaError::NovaError(
NovaError::InvalidStepOutputLength,
));
return Err(NovaError::InvalidStepOutputLength.into());
}
let (u_primary, w_primary) = cs_primary
.r1cs_instance_and_witness(&pp.r1cs_shape_primary, ck_primary)
.map_err(|err| {
debug!("err {:?}", err);
SuperNovaError::NovaError(NovaError::SynthesisError)
NovaError::SynthesisError
})?;

// base case for the secondary
Expand All @@ -451,15 +447,13 @@ where
);
let (_, zi_secondary) = circuit_secondary
.synthesize(&mut cs_secondary)
.map_err(|_| SuperNovaError::NovaError(NovaError::SynthesisError))?;
.map_err(|_| NovaError::SynthesisError)?;
if zi_secondary.len() != pp.F_arity_secondary {
return Err(SuperNovaError::NovaError(
NovaError::InvalidStepOutputLength,
));
return Err(NovaError::InvalidStepOutputLength.into());
}
let (u_secondary, w_secondary) = cs_secondary
.r1cs_instance_and_witness(&pp.r1cs_shape_secondary, ck_secondary)
.map_err(|_| SuperNovaError::NovaError(NovaError::UnSat))?;
.map_err(|_| NovaError::UnSat)?;

// IVC proof for the primary circuit
let l_w_primary = w_primary;
Expand All @@ -483,21 +477,15 @@ where
// Outputs of the two circuits and next program counter thus far.
let zi_primary = zi_primary
.iter()
.map(|v| {
v.get_value()
.ok_or(SuperNovaError::NovaError(NovaError::SynthesisError))
})
.map(|v| v.get_value().ok_or(NovaError::SynthesisError.into()))
.collect::<Result<Vec<<G1 as Group>::Scalar>, SuperNovaError>>()?;
let zi_primary_pc_next = zi_primary_pc_next
.expect("zi_primary_pc_next missing")
.get_value()
.ok_or(SuperNovaError::NovaError(NovaError::SynthesisError))?;
.ok_or::<SuperNovaError>(NovaError::SynthesisError.into())?;
let zi_secondary = zi_secondary
.iter()
.map(|v| {
v.get_value()
.ok_or(SuperNovaError::NovaError(NovaError::SynthesisError))
})
.map(|v| v.get_value().ok_or(NovaError::SynthesisError.into()))
.collect::<Result<Vec<<G2 as Group>::Scalar>, SuperNovaError>>()?;

// handle the base case by initialize U_next in next round
Expand Down Expand Up @@ -541,7 +529,7 @@ where
}

if self.r_U_secondary.len() != 1 || self.r_W_secondary.len() != 1 {
return Err(SuperNovaError::NovaError(NovaError::ProofVerifyError));
return Err(NovaError::ProofVerifyError.into());
}

let pp = &claim.params;
Expand All @@ -551,9 +539,7 @@ where
let ck_secondary = pp.ck_secondary.as_ref().ok_or(SuperNovaError::MissingCK)?;

if z0_primary.len() != pp.F_arity_primary || z0_secondary.len() != pp.F_arity_secondary {
return Err(SuperNovaError::NovaError(
NovaError::InvalidInitialInputLength,
));
return Err(NovaError::InvalidInitialInputLength.into());
}

// fold the secondary circuit's instance
Expand Down