simplify (remove PCS trait)

Author: TomWambsgans

Cargo.lock

@@ -45,7 +45,7 @@ sumcheck = { path = "crates/sumcheck" }
 utils = { path = "crates/utils" }
 lean_vm = { path = "crates/lean_vm" }
 xmss = { path = "crates/xmss" }
-pcs = { path = "crates/pcs" }
+packed_pcs = { path = "crates/packed_pcs" }
 lookup = { path = "crates/lookup" }
 lean_compiler = { path = "crates/lean_compiler" }
 lean_prover = { path = "crates/lean_prover" }
@@ -96,5 +96,5 @@ whir-p3.workspace = true
 p3-uni-stark.workspace = true
 utils.workspace = true
 p3-util.workspace = true
-pcs.workspace = true
+packed_pcs.workspace = true
 p3-air.workspace = true

Cargo.toml

@@ -18,7 +18,6 @@ p3-air.workspace = true
 p3-uni-stark.workspace = true
 # p3-challenger.workspace = true
 p3-matrix.workspace = true
-# pcs.workspace = true
 p3-util.workspace = true
 
 [dev-dependencies]

crates/air/Cargo.toml

@@ -24,7 +24,7 @@ whir-p3.workspace = true
 rayon.workspace = true
 tracing.workspace = true
 air.workspace = true
-pcs.workspace = true
+packed_pcs.workspace = true
 p3-poseidon2-air.workspace = true
 lookup.workspace = true
 sumcheck.workspace = true

crates/lean_compiler/Cargo.toml

@@ -24,7 +24,7 @@ whir-p3.workspace = true
 rayon.workspace = true
 tracing.workspace = true
 air.workspace = true
-pcs.workspace = true
+packed_pcs.workspace = true
 p3-poseidon2-air.workspace = true
 lookup.workspace = true
 sumcheck.workspace = true

crates/lean_prover/Cargo.toml

@@ -1,6 +1,6 @@
 use p3_air::BaseAir;
 use p3_field::{ExtensionField, PrimeCharacteristicRing};
-use pcs::ColDims;
+use packed_pcs::ColDims;
 use rayon::prelude::*;
 use std::ops::Range;
 use sumcheck::{SumcheckComputation, SumcheckComputationPacked};

crates/lean_prover/src/common.rs

@@ -9,8 +9,7 @@ use p3_field::BasedVectorSpace;
 use p3_field::ExtensionField;
 use p3_field::PrimeCharacteristicRing;
 use p3_util::{log2_ceil_usize, log2_strict_usize};
-use pcs::{ColDims, num_packed_vars_for_dims};
-use pcs::{packed_pcs_commit, packed_pcs_global_statements_for_prover};
+use packed_pcs::*;
 use rayon::prelude::*;
 use std::collections::BTreeMap;
 use sumcheck::MleGroupRef;
@@ -1353,10 +1352,10 @@ pub fn prove_execution(
         &mut prover_state,
     );
 
-    whir_p3::whir::prover::Prover(&WhirConfig::new(
+    WhirConfig::new(
         whir_config_builder,
         log2_strict_usize(packed_pcs_witness_base.packed_polynomial.len()),
-    ))
+    )
     .batch_prove(
         &dft,
         &mut prover_state,

crates/lean_prover/src/prove_execution.rs

@@ -9,10 +9,7 @@ use p3_field::BasedVectorSpace;
 use p3_field::PrimeCharacteristicRing;
 use p3_field::dot_product;
 use p3_util::{log2_ceil_usize, log2_strict_usize};
-use pcs::ColDims;
-use pcs::num_packed_vars_for_dims;
-use pcs::packed_pcs_global_statements_for_verifier;
-use pcs::packed_pcs_parse_commitment;
+use packed_pcs::*;
 use sumcheck::SumcheckComputation;
 use utils::dot_product_with_base;
 use utils::{PF, build_challenger, padd_with_zero_to_next_power_of_two};
@@ -1009,11 +1006,7 @@ pub fn verify_execution(
         &Default::default(),
     )?;
 
-    whir_p3::whir::verifier::Verifier(&WhirConfig::new(
-        whir_config_builder,
-        parsed_commitment_base.num_variables,
-    ))
-    .batch_verify(
+    WhirConfig::new(whir_config_builder, parsed_commitment_base.num_variables).batch_verify(
         &mut verifier_state,
         &parsed_commitment_base,
         global_statements_base,

crates/lean_prover/src/verify_execution.rs

@@ -24,7 +24,7 @@ whir-p3.workspace = true
 rayon.workspace = true
 tracing.workspace = true
 air.workspace = true
-pcs.workspace = true
+packed_pcs.workspace = true
 p3-poseidon2-air.workspace = true
 lookup.workspace = true
 sumcheck.workspace = true

crates/lean_prover/vm_air/Cargo.toml

@@ -24,7 +24,7 @@ whir-p3.workspace = true
 rayon.workspace = true
 tracing.workspace = true
 air.workspace = true
-pcs.workspace = true
+packed_pcs.workspace = true
 p3-poseidon2-air.workspace = true
 lookup.workspace = true
 sumcheck.workspace = true