Collapse random_{poly,blind} fields back into Committed in other structures.

This commit is contained in:
Sean Bowe 2021-07-13 16:19:44 -06:00
parent 8caafc0abf
commit 4cd0bffc8e
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
1 changed files with 7 additions and 11 deletions

View File

@ -23,15 +23,13 @@ pub(in crate::plonk) struct Committed<C: CurveAffine> {
pub(in crate::plonk) struct Constructed<C: CurveAffine> {
h_pieces: Vec<Polynomial<C::Scalar, Coeff>>,
h_blinds: Vec<Blind<C::Scalar>>,
random_poly: Polynomial<C::Scalar, Coeff>,
random_blind: Blind<C::Scalar>,
committed: Committed<C>,
}
pub(in crate::plonk) struct Evaluated<C: CurveAffine> {
h_poly: Polynomial<C::Scalar, Coeff>,
h_blind: Blind<C::Scalar>,
random_poly: Polynomial<C::Scalar, Coeff>,
random_blind: Blind<C::Scalar>,
committed: Committed<C>,
}
impl<C: CurveAffine> Argument<C> {
@ -107,8 +105,7 @@ impl<C: CurveAffine> Committed<C> {
Ok(Constructed {
h_pieces,
h_blinds,
random_poly: self.random_poly,
random_blind: self.random_blind,
committed: self,
})
}
}
@ -135,7 +132,7 @@ impl<C: CurveAffine> Constructed<C> {
acc * Blind(xn) + *eval
});
let random_eval = eval_polynomial(&self.random_poly, *x);
let random_eval = eval_polynomial(&self.committed.random_poly, *x);
transcript
.write_scalar(random_eval)
.map_err(|_| Error::TranscriptError)?;
@ -143,8 +140,7 @@ impl<C: CurveAffine> Constructed<C> {
Ok(Evaluated {
h_poly,
h_blind,
random_poly: self.random_poly,
random_blind: self.random_blind,
committed: self.committed,
})
}
}
@ -162,8 +158,8 @@ impl<C: CurveAffine> Evaluated<C> {
}))
.chain(Some(ProverQuery {
point: *x,
poly: &self.random_poly,
blind: self.random_blind,
poly: &self.committed.random_poly,
blind: self.committed.random_blind,
}))
}
}