Rename const_* -> constant_*
This commit is contained in:
parent
4bf46fc349
commit
d29246b49b
|
@ -225,7 +225,7 @@ pub trait Circuit<F: Field> {
|
|||
#[derive(Clone, Debug)]
|
||||
pub enum Expression<F> {
|
||||
/// 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<F: Field> Expression<F> {
|
|||
/// operations.
|
||||
pub fn evaluate<T>(
|
||||
&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<F: Field> Expression<F> {
|
|||
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<F: Field> Expression<F> {
|
|||
scaled,
|
||||
);
|
||||
let b = b.evaluate(
|
||||
const_column,
|
||||
constant,
|
||||
fixed_column,
|
||||
advice_column,
|
||||
instance_column,
|
||||
|
@ -281,7 +281,7 @@ impl<F: Field> Expression<F> {
|
|||
}
|
||||
Expression::Product(a, b) => {
|
||||
let a = a.evaluate(
|
||||
const_column,
|
||||
constant,
|
||||
fixed_column,
|
||||
advice_column,
|
||||
instance_column,
|
||||
|
@ -290,7 +290,7 @@ impl<F: Field> Expression<F> {
|
|||
scaled,
|
||||
);
|
||||
let b = b.evaluate(
|
||||
const_column,
|
||||
constant,
|
||||
fixed_column,
|
||||
advice_column,
|
||||
instance_column,
|
||||
|
@ -302,7 +302,7 @@ impl<F: Field> Expression<F> {
|
|||
}
|
||||
Expression::Scaled(a, f) => {
|
||||
let a = a.evaluate(
|
||||
const_column,
|
||||
constant,
|
||||
fixed_column,
|
||||
advice_column,
|
||||
instance_column,
|
||||
|
@ -318,7 +318,7 @@ impl<F: Field> Expression<F> {
|
|||
/// 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,
|
||||
|
|
|
@ -96,7 +96,7 @@ impl<F: FieldExt> Argument<F> {
|
|||
.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<F: FieldExt> Argument<F> {
|
|||
.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(),
|
||||
|
|
|
@ -373,7 +373,7 @@ pub fn create_proof<C: CurveAffine, T: TranscriptWrite<C>, 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(),
|
||||
|
|
|
@ -178,7 +178,7 @@ impl<G: Group> EvaluationDomain<G> {
|
|||
}
|
||||
|
||||
/// 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 {
|
||||
values: vec![scalar; self.n as usize],
|
||||
_marker: PhantomData,
|
||||
|
@ -196,7 +196,7 @@ impl<G: Group> EvaluationDomain<G> {
|
|||
|
||||
/// Returns a constant polynomial in the extended Lagrange coefficient
|
||||
/// basis
|
||||
pub fn const_extended(&self, scalar: G) -> Polynomial<G, ExtendedLagrangeCoeff> {
|
||||
pub fn constant_extended(&self, scalar: G) -> Polynomial<G, ExtendedLagrangeCoeff> {
|
||||
Polynomial {
|
||||
values: vec![scalar; self.extended_len()],
|
||||
_marker: PhantomData,
|
||||
|
|
Loading…
Reference in New Issue