diff --git a/gkr/src/circuit.rs b/gkr/src/circuit.rs index 80d3defab..0d4c4e7a3 100644 --- a/gkr/src/circuit.rs +++ b/gkr/src/circuit.rs @@ -42,6 +42,8 @@ where in_eq_vec: &[E], challenges: &HashMap>, ) -> E; + // TODO(Matthias, by 2024-11-01): review whether we need this function after all. + #[allow(dead_code)] fn fix_out_variables( &self, in_size: usize, diff --git a/gkr/src/gadgets/keccak256.rs b/gkr/src/gadgets/keccak256.rs index 6696f39a1..125d66bb4 100644 --- a/gkr/src/gadgets/keccak256.rs +++ b/gkr/src/gadgets/keccak256.rs @@ -13,8 +13,7 @@ use ff::Field; use ff_ext::ExtensionField; use itertools::{izip, Itertools}; use multilinear_extensions::{ - mle::{DenseMultilinearExtension, IntoMLE}, - virtual_poly_v2::ArcMultilinearExtension, + mle::DenseMultilinearExtension, virtual_poly_v2::ArcMultilinearExtension, }; use simple_frontend::structs::CircuitBuilder; use std::iter; @@ -467,6 +466,7 @@ pub fn prove_keccak256<'a, E: ExtensionField>( #[cfg(test)] { use crate::structs::CircuitWitness; + use multilinear_extensions::mle::IntoMLE; let all_zero: Vec> = vec![ vec![E::BaseField::ZERO; 25 * 64], vec![E::BaseField::ZERO; 17 * 64], diff --git a/gkr/src/prover.rs b/gkr/src/prover.rs index ade53770a..4b07b16cb 100644 --- a/gkr/src/prover.rs +++ b/gkr/src/prover.rs @@ -12,8 +12,8 @@ use transcript::Transcript; use crate::{ entered_span, exit_span, structs::{ - Circuit, CircuitWitness, GKRInputClaims, IOPProof, IOPProverState, IOPProverStepMessage, - PointAndEval, SumcheckStepType, + Circuit, CircuitWitness, GKRInputClaims, IOPProof, IOPProverState, PointAndEval, + SumcheckStepType, }, tracing_span, }; diff --git a/gkr/src/prover/phase1_output.rs b/gkr/src/prover/phase1_output.rs index 217dd9b0e..1d4c97f2d 100644 --- a/gkr/src/prover/phase1_output.rs +++ b/gkr/src/prover/phase1_output.rs @@ -3,7 +3,6 @@ use ff::Field; use ff_ext::ExtensionField; use itertools::{izip, Itertools}; use multilinear_extensions::{ - commutative_op_mle_pair, mle::{ DenseMultilinearExtension, InstanceIntoIteratorMut, IntoInstanceIter, IntoInstanceIterMut, }, diff --git a/gkr/src/prover/phase2.rs b/gkr/src/prover/phase2.rs index 3040142ea..f3572cc8a 100644 --- a/gkr/src/prover/phase2.rs +++ b/gkr/src/prover/phase2.rs @@ -102,6 +102,8 @@ impl IOPProverState { < lo_in_num_vars { Arc::new( + // TODO(Matthias, by 2024-11-01): review whether we can redesign this API to avoid the deprecated resize_ranged + #[allow(deprecated)] circuit_witness.layers_ref()[layer_id as usize + 1].resize_ranged( 1 << hi_num_vars, 1 << lo_in_num_vars, diff --git a/gkr/src/prover/phase2_input.rs b/gkr/src/prover/phase2_input.rs index 1b4ea0699..87611b04e 100644 --- a/gkr/src/prover/phase2_input.rs +++ b/gkr/src/prover/phase2_input.rs @@ -127,6 +127,7 @@ impl IOPProverState { virtual_poly.merge(&tmp); } + #[allow(deprecated)] let (sumcheck_proofs, prover_state) = SumcheckStateV2::prove_parallel(virtual_poly, transcript); let eval_point = sumcheck_proofs.point.clone(); diff --git a/gkr/src/prover/phase2_linear.rs b/gkr/src/prover/phase2_linear.rs index 71a889641..4f6d21af7 100644 --- a/gkr/src/prover/phase2_linear.rs +++ b/gkr/src/prover/phase2_linear.rs @@ -128,6 +128,8 @@ impl IOPProverState { virtual_poly_1.merge(&tmp); } + // TODO(Matthias, by 2024-11-01): review whether we can replace this function. + #[allow(deprecated)] let (sumcheck_proof_1, prover_state) = SumcheckStateV2::prove_parallel(virtual_poly_1, transcript); let eval_point_1 = sumcheck_proof_1.point.clone(); diff --git a/gkr/src/structs.rs b/gkr/src/structs.rs index 50ecb8fd3..9cef95d95 100644 --- a/gkr/src/structs.rs +++ b/gkr/src/structs.rs @@ -5,9 +5,7 @@ use std::{ use ff_ext::ExtensionField; use goldilocks::SmallField; -use multilinear_extensions::{ - mle::ArcDenseMultilinearExtension, virtual_poly_v2::ArcMultilinearExtension, -}; +use multilinear_extensions::virtual_poly_v2::ArcMultilinearExtension; use serde::{Deserialize, Serialize, Serializer}; use simple_frontend::structs::{CellId, ChallengeConst, ConstantType, LayerId};