diff --git a/src/plonk/circuit.rs b/src/plonk/circuit.rs index dc84cbb..8f959cf 100644 --- a/src/plonk/circuit.rs +++ b/src/plonk/circuit.rs @@ -225,7 +225,7 @@ pub trait Circuit { #[derive(Clone, Debug)] pub enum Expression { /// This is a constant polynomial - Const(F), + Constant(F), /// This is a fixed column queried at a certain relative location Fixed(usize), /// This is an advice (witness) column queried at a certain relative location @@ -245,7 +245,7 @@ impl Expression { /// operations. pub fn evaluate( &self, - const_column: &impl Fn(F) -> T, + constant: &impl Fn(F) -> T, fixed_column: &impl Fn(usize) -> T, advice_column: &impl Fn(usize) -> T, instance_column: &impl Fn(usize) -> T, @@ -254,13 +254,13 @@ impl Expression { scaled: &impl Fn(T, F) -> T, ) -> T { match self { - Expression::Const(scalar) => const_column(*scalar), + Expression::Constant(scalar) => constant(*scalar), Expression::Fixed(index) => fixed_column(*index), Expression::Advice(index) => advice_column(*index), Expression::Instance(index) => instance_column(*index), Expression::Sum(a, b) => { let a = a.evaluate( - const_column, + constant, fixed_column, advice_column, instance_column, @@ -269,7 +269,7 @@ impl Expression { scaled, ); let b = b.evaluate( - const_column, + constant, fixed_column, advice_column, instance_column, @@ -281,7 +281,7 @@ impl Expression { } Expression::Product(a, b) => { let a = a.evaluate( - const_column, + constant, fixed_column, advice_column, instance_column, @@ -290,7 +290,7 @@ impl Expression { scaled, ); let b = b.evaluate( - const_column, + constant, fixed_column, advice_column, instance_column, @@ -302,7 +302,7 @@ impl Expression { } Expression::Scaled(a, f) => { let a = a.evaluate( - const_column, + constant, fixed_column, advice_column, instance_column, @@ -318,7 +318,7 @@ impl Expression { /// Compute the degree of this polynomial pub fn degree(&self) -> usize { match self { - Expression::Const(_) => 0, + Expression::Constant(_) => 0, Expression::Fixed(_) => 1, Expression::Advice(_) => 1, Expression::Instance(_) => 1, diff --git a/src/plonk/lookup/prover.rs b/src/plonk/lookup/prover.rs index a574a17..5abe772 100644 --- a/src/plonk/lookup/prover.rs +++ b/src/plonk/lookup/prover.rs @@ -96,7 +96,7 @@ impl Argument { .iter() .map(|expression| { expression.evaluate( - &|scalar| pk.vk.domain.const_lagrange(scalar), + &|scalar| pk.vk.domain.constant_lagrange(scalar), &|index| { let query = pk.vk.cs.fixed_queries[index]; let column_index = query.0.index(); @@ -138,7 +138,7 @@ impl Argument { .iter() .map(|expression| { expression.evaluate( - &|scalar| pk.vk.domain.const_extended(scalar), + &|scalar| pk.vk.domain.constant_extended(scalar), &|index| fixed_cosets[index].clone(), &|index| advice_cosets[index].clone(), &|index| instance_cosets[index].clone(), diff --git a/src/plonk/prover.rs b/src/plonk/prover.rs index a4597f7..8d1c055 100644 --- a/src/plonk/prover.rs +++ b/src/plonk/prover.rs @@ -373,7 +373,7 @@ pub fn create_proof, ConcreteCircuit: Circ // Custom constraints .chain(meta.gates.iter().map(move |(_, poly)| { poly.evaluate( - &|scalar| pk.vk.domain.const_extended(scalar), + &|scalar| pk.vk.domain.constant_extended(scalar), &|index| pk.fixed_cosets[index].clone(), &|index| advice.advice_cosets[index].clone(), &|index| instance.instance_cosets[index].clone(), diff --git a/src/poly/domain.rs b/src/poly/domain.rs index 2976ac3..ce530c2 100644 --- a/src/poly/domain.rs +++ b/src/poly/domain.rs @@ -178,7 +178,7 @@ impl EvaluationDomain { } /// Returns a constant polynomial in the Lagrange coefficient basis - pub fn const_lagrange(&self, scalar: G) -> Polynomial { + pub fn constant_lagrange(&self, scalar: G) -> Polynomial { Polynomial { values: vec![scalar; self.n as usize], _marker: PhantomData, @@ -196,7 +196,7 @@ impl EvaluationDomain { /// Returns a constant polynomial in the extended Lagrange coefficient /// basis - pub fn const_extended(&self, scalar: G) -> Polynomial { + pub fn constant_extended(&self, scalar: G) -> Polynomial { Polynomial { values: vec![scalar; self.extended_len()], _marker: PhantomData,