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

Use TryFrom to convert Column<Any> to other column types

Browse source
This commit is contained in:
therealyingtong 2020-11-10 00:39:08 +08:00
parent ad781356c2
commit 0519a522aa
1 changed files with 55 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/plonk/circuit.rs
View file

@ -1,6 +1,7 @@
use core::cmp::max; use core::cmp::max;
use core::ops::{Add, Mul}; use core::ops::{Add, Mul};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::convert::TryFrom;
use super::Error; use super::Error;
use crate::arithmetic::Field; use crate::arithmetic::Field;
@ -71,29 +72,50 @@ impl From<Column<Aux>> for Column<Any> {
} }
} }
impl From<Column<Any>> for Column<Advice> { impl TryFrom<Column<Any>> for Column<Advice> {
fn from(any: Column<Any>) -> Column<Advice> { type Error = &'static str;
Column {
index: any.index, fn try_from(any: Column<Any>) -> Result<Self, Self::Error> {
column_type: Advice, match any.column_type {
Any::Advice => {
return Ok(Column {
index: any.index,
column_type: Advice,
})
}
_ => Err("Cannot convert into Column<Advice>"),
} }
} }
} }
impl From<Column<Any>> for Column<Fixed> { impl TryFrom<Column<Any>> for Column<Fixed> {
fn from(any: Column<Any>) -> Column<Fixed> { type Error = &'static str;
Column {
index: any.index, fn try_from(any: Column<Any>) -> Result<Self, Self::Error> {
column_type: Fixed, match any.column_type {
Any::Fixed => {
return Ok(Column {
index: any.index,
column_type: Fixed,
})
}
_ => Err("Cannot convert into Column<Fixed>"),
} }
} }
} }
impl From<Column<Any>> for Column<Aux> { impl TryFrom<Column<Any>> for Column<Aux> {
fn from(any: Column<Any>) -> Column<Aux> { type Error = &'static str;
Column {
index: any.index, fn try_from(any: Column<Any>) -> Result<Self, Self::Error> {
column_type: Aux, match any.column_type {
Any::Aux => {
return Ok(Column {
index: any.index,
column_type: Aux,
})
}
_ => Err("Cannot convert into Column<Aux>"),
} }
} }
} }
@ -406,9 +428,9 @@ 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>::from(column), at), Any::Advice => self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
Any::Fixed => self.query_fixed_index(Column::<Fixed>::from(column), at), Any::Fixed => self.query_fixed_index(Column::<Fixed>::try_from(column).unwrap(), at),
Any::Aux => self.query_aux_index(Column::<Aux>::from(column), at), Any::Aux => self.query_aux_index(Column::<Aux>::try_from(column).unwrap(), at),
}; };
index index
@ -417,13 +439,15 @@ 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 => { Any::Advice => Expression::Advice(
Expression::Advice(self.query_advice_index(Column::<Advice>::from(column), at)) self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
),
Any::Fixed => Expression::Fixed(
self.query_fixed_index(Column::<Fixed>::try_from(column).unwrap(), at),
),
Any::Aux => {
Expression::Aux(self.query_aux_index(Column::<Aux>::try_from(column).unwrap(), at))
} }
Any::Fixed => {
Expression::Fixed(self.query_fixed_index(Column::<Fixed>::from(column), at))
}
Any::Aux => Expression::Aux(self.query_aux_index(Column::<Aux>::from(column), at)),
} }
} }
@ -462,9 +486,13 @@ 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 => self.get_advice_query_index(Column::<Advice>::from(column), at), Any::Advice => {
Any::Fixed => self.get_fixed_query_index(Column::<Fixed>::from(column), at), self.get_advice_query_index(Column::<Advice>::try_from(column).unwrap(), at)
Any::Aux => self.get_aux_query_index(Column::<Aux>::from(column), at), }
Any::Fixed => {
self.get_fixed_query_index(Column::<Fixed>::try_from(column).unwrap(), at)
}
Any::Aux => self.get_aux_query_index(Column::<Aux>::try_from(column).unwrap(), at),
}; };
index index