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

Minor refactors

Browse source 
Co-authored-by: str4d <jack@electriccoin.co>
This commit is contained in:
ying tong 2020-11-11 13:46:18 +08:00 committed by therealyingtong
parent 766caf9214
commit a856137619
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/plonk/circuit.rs
View file

@ -87,12 +87,10 @@ impl TryFrom<Column<Any>> for Column<Advice> {
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 => Ok(Column {
return Ok(Column { index: any.index(),
index: any.index(), column_type: Advice,
column_type: Advice, }),
})
}
_ => Err("Cannot convert into Column<Advice>"), _ => Err("Cannot convert into Column<Advice>"),
} }
} }
@ -103,12 +101,10 @@ impl TryFrom<Column<Any>> for Column<Fixed> {
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 => Ok(Column {
return Ok(Column { index: any.index(),
index: any.index(), column_type: Fixed,
column_type: Fixed, }),
})
}
_ => Err("Cannot convert into Column<Fixed>"), _ => Err("Cannot convert into Column<Fixed>"),
} }
} }
@ -119,12 +115,10 @@ impl TryFrom<Column<Any>> for Column<Aux> {
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 => Ok(Column {
return Ok(Column { index: any.index(),
index: any.index(), column_type: Aux,
column_type: Aux, }),
})
}
_ => Err("Cannot convert into Column<Aux>"), _ => Err("Cannot convert into Column<Aux>"),
} }
} }
@ -495,7 +489,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() { 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)
} }
@ -503,9 +497,7 @@ impl<F: Field> ConstraintSystem<F> {
self.get_fixed_query_index(Column::<Fixed>::try_from(column).unwrap(), at) 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), Any::Aux => self.get_aux_query_index(Column::<Aux>::try_from(column).unwrap(), at),
}; }
index
} }
/// Create a new gate /// Create a new gate