Refactor the Committed structure.

This commit is contained in:
Sean Bowe 2021-01-13 15:44:37 -07:00
parent cc6b0bb7f2
commit 9a26ef1acd
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
1 changed files with 5 additions and 7 deletions

View File

@ -16,8 +16,7 @@ pub struct PermutationCommitments<C: CurveAffine> {
} }
pub struct Committed<C: CurveAffine> { pub struct Committed<C: CurveAffine> {
permuted_input_commitment: C, permuted: PermutationCommitments<C>,
permuted_table_commitment: C,
product_commitment: C, product_commitment: C,
} }
@ -59,8 +58,7 @@ impl<C: CurveAffine> PermutationCommitments<C> {
.map_err(|_| Error::TranscriptError)?; .map_err(|_| Error::TranscriptError)?;
Ok(Committed { Ok(Committed {
permuted_input_commitment: self.permuted_input_commitment, permuted: self,
permuted_table_commitment: self.permuted_table_commitment,
product_commitment, product_commitment,
}) })
} }
@ -176,19 +174,19 @@ impl<C: CurveAffine> Evaluated<C> {
// Open lookup input commitments at x // Open lookup input commitments at x
.chain(Some(VerifierQuery { .chain(Some(VerifierQuery {
point: *x, point: *x,
commitment: &self.committed.permuted_input_commitment, commitment: &self.committed.permuted.permuted_input_commitment,
eval: self.permuted_input_eval, eval: self.permuted_input_eval,
})) }))
// Open lookup table commitments at x // Open lookup table commitments at x
.chain(Some(VerifierQuery { .chain(Some(VerifierQuery {
point: *x, point: *x,
commitment: &self.committed.permuted_table_commitment, commitment: &self.committed.permuted.permuted_table_commitment,
eval: self.permuted_table_eval, eval: self.permuted_table_eval,
})) }))
// Open lookup input commitments at \omega^{-1} x // Open lookup input commitments at \omega^{-1} x
.chain(Some(VerifierQuery { .chain(Some(VerifierQuery {
point: x_inv, point: x_inv,
commitment: &self.committed.permuted_input_commitment, commitment: &self.committed.permuted.permuted_input_commitment,
eval: self.permuted_input_inv_eval, eval: self.permuted_input_inv_eval,
})) }))
// Open lookup product commitments at \omega^{-1} x // Open lookup product commitments at \omega^{-1} x