zec
/
pasta_curves
mirror of https://github.com/zcash/pasta_curves.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename const_* -> constant_*

This commit is contained in:
therealyingtong 2021-02-14 08:48:44 +08:00 committed by Sean Bowe
parent 4bf46fc349
commit d29246b49b
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plonk/circuit.rs
View File

@ -225,7 +225,7 @@ pub trait Circuit<F: Field> {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum Expression<F> { pub enum Expression<F> {
/// This is a constant polynomial /// This is a constant polynomial
Const(F), Constant(F),
/// This is a fixed column queried at a certain relative location /// This is a fixed column queried at a certain relative location
Fixed(usize), Fixed(usize),
/// This is an advice (witness) column queried at a certain relative location /// This is an advice (witness) column queried at a certain relative location
@ -245,7 +245,7 @@ impl<F: Field> Expression<F> {
/// operations. /// operations.
pub fn evaluate<T>( pub fn evaluate<T>(
&self, &self,
const_column: &impl Fn(F) -> T, constant: &impl Fn(F) -> T,
fixed_column: &impl Fn(usize) -> T, fixed_column: &impl Fn(usize) -> T,
advice_column: &impl Fn(usize) -> T, advice_column: &impl Fn(usize) -> T,
instance_column: &impl Fn(usize) -> T, instance_column: &impl Fn(usize) -> T,
@ -254,13 +254,13 @@ impl<F: Field> Expression<F> {
scaled: &impl Fn(T, F) -> T, scaled: &impl Fn(T, F) -> T,
) -> T { ) -> T {
match self { match self {
Expression::Const(scalar) => const_column(*scalar), Expression::Constant(scalar) => constant(*scalar),
Expression::Fixed(index) => fixed_column(*index), Expression::Fixed(index) => fixed_column(*index),
Expression::Advice(index) => advice_column(*index), Expression::Advice(index) => advice_column(*index),
Expression::Instance(index) => instance_column(*index), Expression::Instance(index) => instance_column(*index),
Expression::Sum(a, b) => { Expression::Sum(a, b) => {
let a = a.evaluate( let a = a.evaluate(
const_column, constant,
fixed_column, fixed_column,
advice_column, advice_column,
instance_column, instance_column,
@ -269,7 +269,7 @@ impl<F: Field> Expression<F> {
scaled, scaled,
); );
let b = b.evaluate( let b = b.evaluate(
const_column, constant,
fixed_column, fixed_column,
advice_column, advice_column,
instance_column, instance_column,
@ -281,7 +281,7 @@ impl<F: Field> Expression<F> {
} }
Expression::Product(a, b) => { Expression::Product(a, b) => {
let a = a.evaluate( let a = a.evaluate(
const_column, constant,
fixed_column, fixed_column,
advice_column, advice_column,
instance_column, instance_column,
@ -290,7 +290,7 @@ impl<F: Field> Expression<F> {
scaled, scaled,
); );
let b = b.evaluate( let b = b.evaluate(
const_column, constant,
fixed_column, fixed_column,
advice_column, advice_column,
instance_column, instance_column,
@ -302,7 +302,7 @@ impl<F: Field> Expression<F> {
} }
Expression::Scaled(a, f) => { Expression::Scaled(a, f) => {
let a = a.evaluate( let a = a.evaluate(
const_column, constant,
fixed_column, fixed_column,
advice_column, advice_column,
instance_column, instance_column,
@ -318,7 +318,7 @@ impl<F: Field> Expression<F> {
/// Compute the degree of this polynomial /// Compute the degree of this polynomial
pub fn degree(&self) -> usize { pub fn degree(&self) -> usize {
match self { match self {
Expression::Const(_) => 0, Expression::Constant(_) => 0,
Expression::Fixed(_) => 1, Expression::Fixed(_) => 1,
Expression::Advice(_) => 1, Expression::Advice(_) => 1,
Expression::Instance(_) => 1, Expression::Instance(_) => 1,

4
src/plonk/lookup/prover.rs
View File

@ -96,7 +96,7 @@ impl<F: FieldExt> Argument<F> {
.iter() .iter()
.map(|expression| { .map(|expression| {
expression.evaluate( expression.evaluate(
&|scalar| pk.vk.domain.const_lagrange(scalar), &|scalar| pk.vk.domain.constant_lagrange(scalar),
&|index| { &|index| {
let query = pk.vk.cs.fixed_queries[index]; let query = pk.vk.cs.fixed_queries[index];
let column_index = query.0.index(); let column_index = query.0.index();
@ -138,7 +138,7 @@ impl<F: FieldExt> Argument<F> {
.iter() .iter()
.map(|expression| { .map(|expression| {
expression.evaluate( expression.evaluate(
&|scalar| pk.vk.domain.const_extended(scalar), &|scalar| pk.vk.domain.constant_extended(scalar),
&|index| fixed_cosets[index].clone(), &|index| fixed_cosets[index].clone(),
&|index| advice_cosets[index].clone(), &|index| advice_cosets[index].clone(),
&|index| instance_cosets[index].clone(), &|index| instance_cosets[index].clone(),

2
src/plonk/prover.rs
View File

@ -373,7 +373,7 @@ pub fn create_proof<C: CurveAffine, T: TranscriptWrite<C>, ConcreteCircuit: Circ
// Custom constraints // Custom constraints
.chain(meta.gates.iter().map(move |(_, poly)| { .chain(meta.gates.iter().map(move |(_, poly)| {
poly.evaluate( poly.evaluate(
&|scalar| pk.vk.domain.const_extended(scalar), &|scalar| pk.vk.domain.constant_extended(scalar),
&|index| pk.fixed_cosets[index].clone(), &|index| pk.fixed_cosets[index].clone(),
&|index| advice.advice_cosets[index].clone(), &|index| advice.advice_cosets[index].clone(),
&|index| instance.instance_cosets[index].clone(), &|index| instance.instance_cosets[index].clone(),

4
src/poly/domain.rs
View File

@ -178,7 +178,7 @@ impl<G: Group> EvaluationDomain<G> {
} }
/// Returns a constant polynomial in the Lagrange coefficient basis /// Returns a constant polynomial in the Lagrange coefficient basis
pub fn const_lagrange(&self, scalar: G) -> Polynomial<G, LagrangeCoeff> { pub fn constant_lagrange(&self, scalar: G) -> Polynomial<G, LagrangeCoeff> {
Polynomial { Polynomial {
values: vec![scalar; self.n as usize], values: vec![scalar; self.n as usize],
_marker: PhantomData, _marker: PhantomData,
@ -196,7 +196,7 @@ impl<G: Group> EvaluationDomain<G> {
/// Returns a constant polynomial in the extended Lagrange coefficient /// Returns a constant polynomial in the extended Lagrange coefficient
/// basis /// basis
pub fn const_extended(&self, scalar: G) -> Polynomial<G, ExtendedLagrangeCoeff> { pub fn constant_extended(&self, scalar: G) -> Polynomial<G, ExtendedLagrangeCoeff> {
Polynomial { Polynomial {
values: vec![scalar; self.extended_len()], values: vec![scalar; self.extended_len()],
_marker: PhantomData, _marker: PhantomData,