Skip to content

Commit

Permalink
Poly-commitment: rename evaluation_proof into ipa
Browse files Browse the repository at this point in the history
Result of:
```
find arrabiata -name "*.rs" -type f -exec sed -i 's/evaluation_proof/ipa/g' {} \;
```
(replace arrabiata with folding, ivc, kimchi, msg, o1vm, poly_commitment, tools)

followed by cargo +nightly fmt and `git mv poly-commitment/src/evaluation_proof.rs poly-commitment/src/ipa.rs`.
  • Loading branch information
dannywillems committed Oct 1, 2024
1 parent 87ccc3a commit 512918e
Show file tree
Hide file tree
Showing 37 changed files with 45 additions and 42 deletions.
2 changes: 1 addition & 1 deletion arrabiata/src/witness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use log::{debug, info};
use num_bigint::{BigInt, BigUint};
use num_integer::Integer;
use o1_utils::field_helpers::FieldHelpers;
use poly_commitment::{commitment::CommitmentCurve, evaluation_proof::SRS, PolyComm, SRS as _};
use poly_commitment::{commitment::CommitmentCurve, ipa::SRS, PolyComm, SRS as _};
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
use std::time::Instant;

Expand Down
2 changes: 1 addition & 1 deletion folding/src/standard_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ mod example {

let constraints = vec![constraint()];
let domain = Radix2EvaluationDomain::<Fp>::new(2).unwrap();
let mut srs = poly_commitment::evaluation_proof::SRS::<Curve>::create(2);
let mut srs = poly_commitment::ipa::SRS::<Curve>::create(2);
srs.add_lagrange_basis(domain);
// this is the default structure, which does nothing or panics if
// indexed (as it shouldn't be indexed)
Expand Down
2 changes: 1 addition & 1 deletion folding/tests/test_decomposable_folding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use folding::{
};
use itertools::Itertools;
use kimchi::circuits::{expr::Variable, gate::CurrOrNext};
use poly_commitment::{evaluation_proof::SRS, SRS as _};
use poly_commitment::{ipa::SRS, SRS as _};
use rand::thread_rng;
use std::{collections::BTreeMap, ops::Index};

Expand Down
2 changes: 1 addition & 1 deletion folding/tests/test_folding_with_quadriticization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use folding::{
use itertools::Itertools;
use kimchi::circuits::{expr::Variable, gate::CurrOrNext};
use mina_poseidon::{constants::PlonkSpongeConstantsKimchi, sponge::DefaultFqSponge};
use poly_commitment::{evaluation_proof::SRS, SRS as _};
use poly_commitment::{ipa::SRS, SRS as _};
use rand::thread_rng;
use std::{collections::BTreeMap, ops::Index};

Expand Down
4 changes: 2 additions & 2 deletions folding/tests/test_quadraticization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use folding::{
Witness,
};
use kimchi::circuits::{expr::Variable, gate::CurrOrNext};
use poly_commitment::{evaluation_proof::SRS, SRS as _};
use poly_commitment::{ipa::SRS, SRS as _};
use std::{
collections::hash_map::DefaultHasher,
hash::{Hash, Hasher},
Expand Down Expand Up @@ -146,7 +146,7 @@ fn test_with_constraints(constraints: Vec<FoldingCompatibleExpr<TestConfig>>) ->
use ark_poly::EvaluationDomain;

let domain = Radix2EvaluationDomain::<Fp>::new(2).unwrap();
let mut srs = poly_commitment::evaluation_proof::SRS::<Curve>::create(2);
let mut srs = poly_commitment::ipa::SRS::<Curve>::create(2);
srs.add_lagrange_basis(domain);

let (scheme, _) = FoldingScheme::<TestConfig>::new(constraints, &srs, domain, &());
Expand Down
4 changes: 2 additions & 2 deletions folding/tests/test_vanilla_folding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use kimchi::{
curve::KimchiCurve,
};
use mina_poseidon::{constants::PlonkSpongeConstantsKimchi, sponge::DefaultFqSponge, FqSponge};
use poly_commitment::{evaluation_proof::SRS, SRS as _};
use poly_commitment::{ipa::SRS, SRS as _};
use rand::thread_rng;
use std::println as debug;

Expand Down Expand Up @@ -396,7 +396,7 @@ mod checker {
fn test_folding_instance() {
let constraints = constraints();
let domain = Radix2EvaluationDomain::<Fp>::new(2).unwrap();
let mut srs = poly_commitment::evaluation_proof::SRS::<Curve>::create(2);
let mut srs = poly_commitment::ipa::SRS::<Curve>::create(2);
srs.add_lagrange_basis(domain);

let mut fq_sponge = BaseSponge::new(Curve::other_curve_sponge_params());
Expand Down
2 changes: 1 addition & 1 deletion ivc/src/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use mina_poseidon::{sponge::ScalarChallenge, FqSponge};
use o1_utils::ExtendedDensePolynomial;
use poly_commitment::{
commitment::{absorb_commitment, CommitmentCurve, PolyComm},
evaluation_proof::DensePolynomialOrEvaluations,
ipa::DensePolynomialOrEvaluations,
kzg::{KZGProof, PairingSRS},
OpenProof, SRS,
};
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use mina_poseidon::{
sponge::{DefaultFqSponge, DefaultFrSponge},
};
use o1_utils::math;
use poly_commitment::{commitment::CommitmentCurve, evaluation_proof::OpeningProof, SRS as _};
use poly_commitment::{commitment::CommitmentCurve, ipa::OpeningProof, SRS as _};

use crate::{
circuits::{
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/circuits/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3539,7 +3539,7 @@ pub mod test {
use ark_ff::UniformRand;
use mina_curves::pasta::{Fp, Pallas, Vesta};
use poly_commitment::{
evaluation_proof::{endos, OpeningProof, SRS},
ipa::{endos, OpeningProof, SRS},
SRS as _,
};
use rand::{prelude::StdRng, SeedableRng};
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/curve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use mina_poseidon::poseidon::ArithmeticSpongeParams;
use once_cell::sync::Lazy;
use poly_commitment::{
commitment::{CommitmentCurve, EndoCurve},
evaluation_proof::endos,
ipa::endos,
};

/// Represents additional information that a curve needs in order to be used
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/oracles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ where
#[cfg(feature = "ocaml_types")]
pub mod caml {
use ark_ff::PrimeField;
use poly_commitment::{commitment::shift_scalar, evaluation_proof::OpeningProof};
use poly_commitment::{commitment::shift_scalar, ipa::OpeningProof};

use crate::{
circuits::scalars::caml::CamlRandomOracles, curve::KimchiCurve, error::VerifyError,
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/precomputed_srs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use crate::curve::KimchiCurve;
use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
use poly_commitment::{evaluation_proof::SRS, PolyComm};
use poly_commitment::{ipa::SRS, PolyComm};
use serde::{Deserialize, Serialize};
use serde_with::serde_as;
use std::{collections::HashMap, fs::File, io::BufReader, path::PathBuf};
Expand Down
8 changes: 4 additions & 4 deletions kimchi/src/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ use poly_commitment::{
commitment::{
absorb_commitment, b_poly_coefficients, BlindedCommitment, CommitmentCurve, PolyComm,
},
evaluation_proof::DensePolynomialOrEvaluations,
ipa::DensePolynomialOrEvaluations,
OpenProof, SRS as _,
};
use rayon::prelude::*;
Expand Down Expand Up @@ -1450,7 +1450,7 @@ where
}

//~ 1. Create an aggregated evaluation proof for all of these polynomials at $\zeta$ and $\zeta\omega$ using $u$ and $v$.
internal_tracing::checkpoint!(internal_traces; create_aggregated_evaluation_proof);
internal_tracing::checkpoint!(internal_traces; create_aggregated_ipa);
let proof = OpenProof::open(
&*index.srs,
group_map,
Expand Down Expand Up @@ -1507,7 +1507,7 @@ internal_tracing::decl_traces!(internal_traces;
compute_ft_poly,
ft_eval_zeta_omega,
build_polynomials,
create_aggregated_evaluation_proof,
create_aggregated_ipa,
create_recursive_done);

#[cfg(feature = "ocaml_types")]
Expand All @@ -1517,7 +1517,7 @@ pub mod caml {
use ark_ec::AffineRepr;
use poly_commitment::{
commitment::caml::CamlPolyComm,
evaluation_proof::{caml::CamlOpeningProof, OpeningProof},
ipa::{caml::CamlOpeningProof, OpeningProof},
};

#[cfg(feature = "internal_tracing")]
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/prover_index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ pub mod testing {
use ark_ff::PrimeField;
use ark_poly::{EvaluationDomain, Radix2EvaluationDomain as D};
use poly_commitment::{
evaluation_proof::{OpeningProof, SRS},
ipa::{OpeningProof, SRS},
OpenProof,
};

Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/snarky/folding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::{
use ark_ec::AffineRepr;
use ark_ff::{BigInteger, One, PrimeField};
use mina_curves::pasta::Fp;
use poly_commitment::{evaluation_proof::OpeningProof, OpenProof};
use poly_commitment::{ipa::OpeningProof, OpenProof};
use std::{marker::PhantomData, ops::Add};

mod instance;
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/snarky/range_checks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ mod test {
constants::PlonkSpongeConstantsKimchi,
sponge::{DefaultFqSponge, DefaultFrSponge},
};
use poly_commitment::evaluation_proof::OpeningProof;
use poly_commitment::ipa::OpeningProof;

type BaseSponge = DefaultFqSponge<VestaParameters, PlonkSpongeConstantsKimchi>;
type ScalarSponge = DefaultFrSponge<Fp, PlonkSpongeConstantsKimchi>;
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/snarky/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use mina_poseidon::{
constants::PlonkSpongeConstantsKimchi,
sponge::{DefaultFqSponge, DefaultFrSponge},
};
use poly_commitment::evaluation_proof::OpeningProof;
use poly_commitment::ipa::OpeningProof;

use super::prelude::*;

Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/endomul.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use mina_poseidon::{
constants::PlonkSpongeConstantsKimchi,
sponge::{DefaultFqSponge, DefaultFrSponge, ScalarChallenge},
};
use poly_commitment::evaluation_proof::endos;
use poly_commitment::ipa::endos;
use rand::{rngs::StdRng, SeedableRng};
use std::{array, ops::Mul};

Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/endomul_scalar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use mina_poseidon::{
constants::PlonkSpongeConstantsKimchi,
sponge::{DefaultFqSponge, DefaultFrSponge, ScalarChallenge},
};
use poly_commitment::evaluation_proof::endos;
use poly_commitment::ipa::endos;
use rand::{rngs::StdRng, SeedableRng};
use std::array;

Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/foreign_field_add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use num_bigint::{BigUint, RandBigInt};
use num_traits::FromPrimitive;
use o1_utils::{foreign_field::ForeignElement, tests::make_test_rng, FieldHelpers, Two};
use poly_commitment::{
evaluation_proof::{endos, OpeningProof, SRS},
ipa::{endos, OpeningProof, SRS},
SRS as _,
};
use rand::{rngs::StdRng, Rng};
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/framework.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use groupmap::GroupMap;
use mina_poseidon::sponge::FqSponge;
use num_bigint::BigUint;
use poly_commitment::{
commitment::CommitmentCurve, evaluation_proof::OpeningProof as DlogOpeningProof, OpenProof,
commitment::CommitmentCurve, ipa::OpeningProof as DlogOpeningProof, OpenProof,
};
use std::{fmt::Write, time::Instant};

Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/not.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use mina_poseidon::{
};
use num_bigint::BigUint;
use o1_utils::{BigUintHelpers, BitwiseOps, FieldHelpers, RandomField};
use poly_commitment::evaluation_proof::OpeningProof;
use poly_commitment::ipa::OpeningProof;

type PallasField = <Pallas as AffineRepr>::BaseField;
type VestaField = <Vesta as AffineRepr>::BaseField;
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/range_check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use mina_poseidon::{
};
use poly_commitment::{
commitment::CommitmentCurve,
evaluation_proof::{endos, OpeningProof, SRS},
ipa::{endos, OpeningProof, SRS},
SRS as _,
};

Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/rot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use mina_poseidon::{
};
use o1_utils::Two;
use poly_commitment::{
evaluation_proof::{endos, OpeningProof, SRS},
ipa::{endos, OpeningProof, SRS},
SRS as _,
};
use rand::Rng;
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use mina_poseidon::{
};
use poly_commitment::{
commitment::CommitmentCurve,
evaluation_proof::{OpeningProof, SRS},
ipa::{OpeningProof, SRS},
SRS as _,
};
use std::{array, time::Instant};
Expand Down
2 changes: 1 addition & 1 deletion kimchi/src/tests/xor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use mina_poseidon::{
use num_bigint::BigUint;
use o1_utils::{BigUintHelpers, BitwiseOps, FieldHelpers, RandomField};
use poly_commitment::{
evaluation_proof::{endos, OpeningProof, SRS},
ipa::{endos, OpeningProof, SRS},
SRS as _,
};

Expand Down
2 changes: 1 addition & 1 deletion msm/src/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use mina_poseidon::{sponge::ScalarChallenge, FqSponge};
use o1_utils::ExtendedDensePolynomial;
use poly_commitment::{
commitment::{absorb_commitment, PolyComm},
evaluation_proof::DensePolynomialOrEvaluations,
ipa::DensePolynomialOrEvaluations,
OpenProof, SRS,
};
use rand::{CryptoRng, RngCore};
Expand Down
2 changes: 1 addition & 1 deletion o1vm/src/pickles/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use o1vm::{
pickles::proof::ProofInputs,
preimage_oracle::PreImageOracle,
};
use poly_commitment::{evaluation_proof::SRS, SRS as _};
use poly_commitment::{ipa::SRS, SRS as _};
use std::{fs::File, io::BufReader, process::ExitCode};

use mina_curves::pasta::{Fp, Vesta};
Expand Down
2 changes: 1 addition & 1 deletion poly-commitment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This library offers implementations of different Polynomial Commitment Scheme

Currently, the following polynomial commitment schemes are implemented:
- [KZG10](./src/kzg.rs)
- [Inner Product Argument](./src/commitment.rs)
- [Inner Product Argument](./src/ipa.rs)

The implementations are made initially to be compatible with Kimchi (a Plonk-ish
variant with 15 wires and some custom gates) and to be used in the Mina
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion poly-commitment/src/kzg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use crate::{
commitment::*,
evaluation_proof::{combine_polys, SRS},
ipa::{combine_polys, SRS},
CommitmentError, PolynomialsToCombine, SRS as SRSTrait,
};

Expand Down
7 changes: 5 additions & 2 deletions poly-commitment/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ pub mod chunked;
mod combine;
pub mod commitment;
pub mod error;
pub mod evaluation_proof;

/// Inner product argument
pub mod ipa;
/// KZG polynomial commitment scheme
pub mod kzg;

pub use commitment::PolyComm;

use crate::{
commitment::{BatchEvaluationProof, BlindedCommitment, CommitmentCurve},
error::CommitmentError,
evaluation_proof::DensePolynomialOrEvaluations,
ipa::DensePolynomialOrEvaluations,
};
use ark_ec::AffineRepr;
use ark_ff::UniformRand;
Expand Down
2 changes: 1 addition & 1 deletion poly-commitment/tests/batch_15_wires.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use mina_poseidon::{
use o1_utils::ExtendedDensePolynomial as _;
use poly_commitment::{
commitment::{combined_inner_product, BatchEvaluationProof, CommitmentCurve, Evaluation},
evaluation_proof::{DensePolynomialOrEvaluations, SRS},
ipa::{DensePolynomialOrEvaluations, SRS},
SRS as _,
};
use rand::Rng;
Expand Down
2 changes: 1 addition & 1 deletion poly-commitment/tests/commitment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use poly_commitment::{
combined_inner_product, BatchEvaluationProof, BlindedCommitment, CommitmentCurve,
Evaluation, PolyComm,
},
evaluation_proof::{DensePolynomialOrEvaluations, OpeningProof, SRS},
ipa::{DensePolynomialOrEvaluations, OpeningProof, SRS},
SRS as _,
};
use rand::{CryptoRng, Rng, SeedableRng};
Expand Down
2 changes: 1 addition & 1 deletion poly-commitment/tests/ipa_commitment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use poly_commitment::{
combine_evaluations, combined_inner_product, BatchEvaluationProof, CommitmentCurve,
Evaluation,
},
evaluation_proof::{DensePolynomialOrEvaluations, SRS},
ipa::{DensePolynomialOrEvaluations, SRS},
PolyComm, SRS as _,
};
use rand::{rngs::StdRng, SeedableRng};
Expand Down
2 changes: 1 addition & 1 deletion poly-commitment/tests/kzg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use ark_poly::{
use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
use poly_commitment::{
commitment::Evaluation,
evaluation_proof::{DensePolynomialOrEvaluations, SRS},
ipa::{DensePolynomialOrEvaluations, SRS},
kzg::{KZGProof, PairingSRS},
SRS as _,
};
Expand Down
2 changes: 1 addition & 1 deletion tools/kimchi-visu/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use kimchi::{
curve::KimchiCurve,
prover_index::ProverIndex,
};
use poly_commitment::{commitment::CommitmentCurve, evaluation_proof::OpeningProof};
use poly_commitment::{commitment::CommitmentCurve, ipa::OpeningProof};
use serde::Serialize;
use std::{
collections::HashMap,
Expand Down

0 comments on commit 512918e

Please sign in to comment.