saymrwulf/pasta_curves-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/pasta_curves-source.git synced 2026-09-08 20:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make getters for column index() and column_type()

Browse source
This commit is contained in:
therealyingtong 2020-11-10 00:45:52 +08:00
parent 0519a522aa
commit 766caf9214
4 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/plonk/circuit.rs
View file

@ -13,8 +13,18 @@ pub trait ColumnType: 'static + Sized {}
/// A column with an index and type /// A column with an index and type
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct Column<C: ColumnType> { pub struct Column<C: ColumnType> {
pub(crate) index: usize, index: usize,
pub(crate) column_type: C, column_type: C,
}
impl<C: ColumnType> Column<C> {
pub(crate) fn index(&self) -> usize {
self.index
}
pub(crate) fn column_type(&self) -> &C {
&self.column_type
}
} }
/// An advice column /// An advice column
@ -48,7 +58,7 @@ impl ColumnType for Any {}
impl From<Column<Advice>> for Column<Any> { impl From<Column<Advice>> for Column<Any> {
fn from(advice: Column<Advice>) -> Column<Any> { fn from(advice: Column<Advice>) -> Column<Any> {
Column { Column {
index: advice.index, index: advice.index(),
column_type: Any::Advice, column_type: Any::Advice,
} }
} }
@ -57,7 +67,7 @@ impl From<Column<Advice>> for Column<Any> {
impl From<Column<Fixed>> for Column<Any> { impl From<Column<Fixed>> for Column<Any> {
fn from(advice: Column<Fixed>) -> Column<Any> { fn from(advice: Column<Fixed>) -> Column<Any> {
Column { Column {
index: advice.index, index: advice.index(),
column_type: Any::Fixed, column_type: Any::Fixed,
} }
} }
@ -66,7 +76,7 @@ impl From<Column<Fixed>> for Column<Any> {
impl From<Column<Aux>> for Column<Any> { impl From<Column<Aux>> for Column<Any> {
fn from(advice: Column<Aux>) -> Column<Any> { fn from(advice: Column<Aux>) -> Column<Any> {
Column { Column {
index: advice.index, index: advice.index(),
column_type: Any::Aux, column_type: Any::Aux,
} }
} }
@ -76,10 +86,10 @@ impl TryFrom<Column<Any>> for Column<Advice> {
type Error = &'static str; type Error = &'static str;
fn try_from(any: Column<Any>) -> Result<Self, Self::Error> { fn try_from(any: Column<Any>) -> Result<Self, Self::Error> {
match any.column_type { match any.column_type() {
Any::Advice => { Any::Advice => {
return Ok(Column { return Ok(Column {
index: any.index, index: any.index(),
column_type: Advice, column_type: Advice,
}) })
} }
@ -92,10 +102,10 @@ impl TryFrom<Column<Any>> for Column<Fixed> {
type Error = &'static str; type Error = &'static str;
fn try_from(any: Column<Any>) -> Result<Self, Self::Error> { fn try_from(any: Column<Any>) -> Result<Self, Self::Error> {
match any.column_type { match any.column_type() {
Any::Fixed => { Any::Fixed => {
return Ok(Column { return Ok(Column {
index: any.index, index: any.index(),
column_type: Fixed, column_type: Fixed,
}) })
} }
@ -108,10 +118,10 @@ impl TryFrom<Column<Any>> for Column<Aux> {
type Error = &'static str; type Error = &'static str;
fn try_from(any: Column<Any>) -> Result<Self, Self::Error> { fn try_from(any: Column<Any>) -> Result<Self, Self::Error> {
match any.column_type { match any.column_type() {
Any::Aux => { Any::Aux => {
return Ok(Column { return Ok(Column {
index: any.index, index: any.index(),
column_type: Aux, column_type: Aux,
}) })
} }
@ -427,7 +437,7 @@ impl<F: Field> ConstraintSystem<F> {
} }
fn query_any_index(&mut self, column: Column<Any>, at: i32) -> usize { fn query_any_index(&mut self, column: Column<Any>, at: i32) -> usize {
let index = match column.column_type { let index = match column.column_type() {
Any::Advice => self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at), Any::Advice => self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
Any::Fixed => self.query_fixed_index(Column::<Fixed>::try_from(column).unwrap(), at), Any::Fixed => self.query_fixed_index(Column::<Fixed>::try_from(column).unwrap(), at),
Any::Aux => self.query_aux_index(Column::<Aux>::try_from(column).unwrap(), at), Any::Aux => self.query_aux_index(Column::<Aux>::try_from(column).unwrap(), at),
@ -438,7 +448,7 @@ impl<F: Field> ConstraintSystem<F> {
/// Query an Any column at a relative position /// Query an Any column at a relative position
pub fn query_any(&mut self, column: Column<Any>, at: i32) -> Expression<F> { pub fn query_any(&mut self, column: Column<Any>, at: i32) -> Expression<F> {
match column.column_type { match column.column_type() {
Any::Advice => Expression::Advice( Any::Advice => Expression::Advice(
self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at), self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
), ),
@ -485,7 +495,7 @@ impl<F: Field> ConstraintSystem<F> {
} }
pub(crate) fn get_any_query_index(&self, column: Column<Any>, at: i32) -> usize { pub(crate) fn get_any_query_index(&self, column: Column<Any>, at: i32) -> usize {
let index = match column.column_type { let index = match column.column_type() {
Any::Advice => { Any::Advice => {
self.get_advice_query_index(Column::<Advice>::try_from(column).unwrap(), at) self.get_advice_query_index(Column::<Advice>::try_from(column).unwrap(), at)
} }

4
src/plonk/keygen.rs
View file

@ -44,7 +44,7 @@ where
) -> Result<(), Error> { ) -> Result<(), Error> {
*self *self
.fixed .fixed
.get_mut(column.index) .get_mut(column.index())
.and_then(|v| v.get_mut(row)) .and_then(|v| v.get_mut(row))
.ok_or(Error::BoundsFailure)? = to()?; .ok_or(Error::BoundsFailure)? = to()?;
@ -230,7 +230,7 @@ where
.fixed_queries .fixed_queries
.iter() .iter()
.map(|&(column, at)| { .map(|&(column, at)| {
let poly = fixed_polys[column.index].clone(); let poly = fixed_polys[column.index()].clone();
domain.coeff_to_extended(poly, at) domain.coeff_to_extended(poly, at)
}) })
.collect(); .collect();

27
src/plonk/prover.rs
View file

@ -45,7 +45,7 @@ impl<C: CurveAffine> Proof<C> {
) -> Result<(), Error> { ) -> Result<(), Error> {
*self *self
.advice .advice
.get_mut(column.index) .get_mut(column.index())
.and_then(|v| v.get_mut(row)) .and_then(|v| v.get_mut(row))
.ok_or(Error::BoundsFailure)? = to()?; .ok_or(Error::BoundsFailure)? = to()?;
@ -120,7 +120,7 @@ impl<C: CurveAffine> Proof<C> {
.aux_queries .aux_queries
.iter() .iter()
.map(|&(column, at)| { .map(|&(column, at)| {
let poly = aux_polys[column.index].clone(); let poly = aux_polys[column.index()].clone();
domain.coeff_to_extended(poly, at) domain.coeff_to_extended(poly, at)
}) })
.collect(); .collect();
@ -157,7 +157,7 @@ impl<C: CurveAffine> Proof<C> {
.advice_queries .advice_queries
.iter() .iter()
.map(|&(column, at)| { .map(|&(column, at)| {
let poly = advice_polys[column.index].clone(); let poly = advice_polys[column.index()].clone();
domain.coeff_to_extended(poly, at) domain.coeff_to_extended(poly, at)
}) })
.collect(); .collect();
@ -192,7 +192,7 @@ impl<C: CurveAffine> Proof<C> {
parallelize(&mut modified_advice, |modified_advice, start| { parallelize(&mut modified_advice, |modified_advice, start| {
for ((modified_advice, advice_value), permuted_advice_value) in modified_advice for ((modified_advice, advice_value), permuted_advice_value) in modified_advice
.iter_mut() .iter_mut()
.zip(witness.advice[column.index][start..].iter()) .zip(witness.advice[column.index()][start..].iter())
.zip(permuted_column_values[start..].iter()) .zip(permuted_column_values[start..].iter())
{ {
*modified_advice *= &(x_0 * permuted_advice_value + &x_1 + advice_value); *modified_advice *= &(x_0 * permuted_advice_value + &x_1 + advice_value);
@ -226,7 +226,7 @@ impl<C: CurveAffine> Proof<C> {
let mut deltaomega = deltaomega * &omega.pow_vartime(&[start as u64, 0, 0, 0]); let mut deltaomega = deltaomega * &omega.pow_vartime(&[start as u64, 0, 0, 0]);
for (modified_advice, advice_value) in modified_advice for (modified_advice, advice_value) in modified_advice
.iter_mut() .iter_mut()
.zip(witness.advice[column.index][start..].iter()) .zip(witness.advice[column.index()][start..].iter())
{ {
// Multiply by p_j(\omega^i) + \delta^j \omega^i \beta // Multiply by p_j(\omega^i) + \delta^j \omega^i \beta
*modified_advice *= &(deltaomega * &x_0 + &x_1 + advice_value); *modified_advice *= &(deltaomega * &x_0 + &x_1 + advice_value);
@ -395,7 +395,7 @@ impl<C: CurveAffine> Proof<C> {
.advice_queries .advice_queries
.iter() .iter()
.map(|&(column, at)| { .map(|&(column, at)| {
eval_polynomial(&advice_polys[column.index], domain.rotate_omega(x_3, at)) eval_polynomial(&advice_polys[column.index()], domain.rotate_omega(x_3, at))
}) })
.collect(); .collect();
@ -403,7 +403,7 @@ impl<C: CurveAffine> Proof<C> {
.aux_queries .aux_queries
.iter() .iter()
.map(|&(column, at)| { .map(|&(column, at)| {
eval_polynomial(&aux_polys[column.index], domain.rotate_omega(x_3, at)) eval_polynomial(&aux_polys[column.index()], domain.rotate_omega(x_3, at))
}) })
.collect(); .collect();
@ -411,7 +411,10 @@ impl<C: CurveAffine> Proof<C> {
.fixed_queries .fixed_queries
.iter() .iter()
.map(|&(column, at)| { .map(|&(column, at)| {
eval_polynomial(&pk.fixed_polys[column.index], domain.rotate_omega(x_3, at)) eval_polynomial(
&pk.fixed_polys[column.index()],
domain.rotate_omega(x_3, at),
)
}) })
.collect(); .collect();
@ -469,8 +472,8 @@ impl<C: CurveAffine> Proof<C> {
instances.push(ProverQuery { instances.push(ProverQuery {
point, point,
poly: &advice_polys[column.index], poly: &advice_polys[column.index()],
blind: advice_blinds[column.index], blind: advice_blinds[column.index()],
eval: advice_evals[query_index], eval: advice_evals[query_index],
}); });
} }
@ -480,7 +483,7 @@ impl<C: CurveAffine> Proof<C> {
instances.push(ProverQuery { instances.push(ProverQuery {
point, point,
poly: &aux_polys[column.index], poly: &aux_polys[column.index()],
blind: Blind::default(), blind: Blind::default(),
eval: aux_evals[query_index], eval: aux_evals[query_index],
}); });
@ -491,7 +494,7 @@ impl<C: CurveAffine> Proof<C> {
instances.push(ProverQuery { instances.push(ProverQuery {
point, point,
poly: &pk.fixed_polys[column.index], poly: &pk.fixed_polys[column.index()],
blind: Blind::default(), blind: Blind::default(),
eval: fixed_evals[query_index], eval: fixed_evals[query_index],
}); });

6
src/plonk/verifier.rs
View file

@ -93,7 +93,7 @@ impl<'a, C: CurveAffine> Proof<C> {
let point = vk.domain.rotate_omega(x_3, at); let point = vk.domain.rotate_omega(x_3, at);
queries.push(VerifierQuery { queries.push(VerifierQuery {
point, point,
commitment: &self.advice_commitments[column.index], commitment: &self.advice_commitments[column.index()],
eval: self.advice_evals[query_index], eval: self.advice_evals[query_index],
}); });
} }
@ -102,7 +102,7 @@ impl<'a, C: CurveAffine> Proof<C> {
let point = vk.domain.rotate_omega(x_3, at); let point = vk.domain.rotate_omega(x_3, at);
queries.push(VerifierQuery { queries.push(VerifierQuery {
point, point,
commitment: &aux_commitments[column.index], commitment: &aux_commitments[column.index()],
eval: self.aux_evals[query_index], eval: self.aux_evals[query_index],
}); });
} }
@ -111,7 +111,7 @@ impl<'a, C: CurveAffine> Proof<C> {
let point = vk.domain.rotate_omega(x_3, at); let point = vk.domain.rotate_omega(x_3, at);
queries.push(VerifierQuery { queries.push(VerifierQuery {
point, point,
commitment: &vk.fixed_commitments[column.index], commitment: &vk.fixed_commitments[column.index()],
eval: self.fixed_evals[query_index], eval: self.fixed_evals[query_index],
}); });
} }