zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename CommonCommitted to CommonEvaluated.

This commit is contained in:
Sean Bowe 2021-07-15 15:22:51 -06:00
parent 3cae0d5f19
commit b0a4a19093
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plonk/permutation/verifier.rs
View File

@ -10,10 +10,6 @@ use crate::{
transcript::{EncodedChallenge, TranscriptRead},
};
pub struct CommonCommitted<C: CurveAffine> {
permutation_evals: Vec<C::Scalar>,
}
pub struct Committed<C: CurveAffine> {
permutation_product_commitments: Vec<C>,
}
@ -25,6 +21,10 @@ pub struct EvaluatedSet<C: CurveAffine> {
permutation_product_last_eval: Option<C::Scalar>,
}
pub struct CommonEvaluated<C: CurveAffine> {
permutation_evals: Vec<C::Scalar>,
}
pub struct Evaluated<C: CurveAffine> {
sets: Vec<EvaluatedSet<C>>,
}
@ -57,14 +57,14 @@ impl<C: CurveAffine> VerifyingKey<C> {
pub(in crate::plonk) fn evaluate<E: EncodedChallenge<C>, T: TranscriptRead<C, E>>(
&self,
transcript: &mut T,
) -> Result<CommonCommitted<C>, Error> {
) -> Result<CommonEvaluated<C>, Error> {
let permutation_evals = self
.commitments
.iter()
.map(|_| transcript.read_scalar().map_err(|_| Error::TranscriptError))
.collect::<Result<Vec<_>, _>>()?;
Ok(CommonCommitted { permutation_evals })
Ok(CommonEvaluated { permutation_evals })
}
}
@ -111,7 +111,7 @@ impl<C: CurveAffine> Evaluated<C> {
&'a self,
vk: &'a plonk::VerifyingKey<C>,
p: &'a Argument,
common: &'a CommonCommitted<C>,
common: &'a CommonEvaluated<C>,
advice_evals: &'a [C::Scalar],
fixed_evals: &'a [C::Scalar],
instance_evals: &'a [C::Scalar],
@ -245,7 +245,7 @@ impl<C: CurveAffine> Evaluated<C> {
}
}
impl<C: CurveAffine> CommonCommitted<C> {
impl<C: CurveAffine> CommonEvaluated<C> {
pub(in crate::plonk) fn queries<'r, 'params: 'r>(
&'r self,
vkey: &'r VerifyingKey<C>,