Fix some mismatches

Author: yczhangsjtu

src/e2e/mod.rs

@@ -5,46 +5,25 @@ use crate::zkvm_verifier::binding::{
     ZKVMProofInput, E, F,
 };
 
-use crate::basefold_verifier::query_phase::QueryPhaseVerifierInput;
-use crate::zkvm_verifier::verifier::{verify_gkr_circuit, verify_zkvm_proof};
+use crate::zkvm_verifier::verifier::verify_zkvm_proof;
 use ceno_mle::util::ceil_log2;
-use ceno_transcript::BasicTranscript;
 use ceno_zkvm::scheme::ZKVMProof;
 use ceno_zkvm::structs::ZKVMVerifyingKey;
 use ff_ext::BabyBearExt4;
-use gkr_iop::gkr::{
-    layer::sumcheck_layer::{SumcheckLayer, SumcheckLayerProof},
-    GKRCircuit,
-};
-use itertools::Itertools;
 use mpcs::{Basefold, BasefoldRSParams};
-use openvm_circuit::arch::{
-    instructions::program::Program, verify_single, SystemConfig, VirtualMachine, VmExecutor,
-};
-use openvm_native_circuit::{Native, NativeConfig};
+use openvm_circuit::arch::instructions::program::Program;
 use openvm_native_compiler::{
     asm::AsmBuilder,
     conversion::{convert_program, CompilerOptions},
     prelude::AsmCompiler,
 };
 use openvm_native_recursion::hints::Hintable;
 use openvm_stark_backend::config::StarkGenericConfig;
-use openvm_stark_sdk::{
-    config::{
-        baby_bear_poseidon2::{BabyBearPoseidon2Config, BabyBearPoseidon2Engine},
-        fri_params::standard_fri_params_with_100_bits_conjectured_security,
-        setup_tracing_with_log_level, FriParameters,
-    },
-    engine::StarkFriEngine,
-    p3_baby_bear::BabyBear,
-};
-use std::fs::File;
+use openvm_stark_sdk::config::baby_bear_poseidon2::BabyBearPoseidon2Config;
 
 type SC = BabyBearPoseidon2Config;
 type EF = <SC as StarkGenericConfig>::Challenge;
 
-use ceno_zkvm::{scheme::verifier::ZKVMVerifier, structs::ComposedConstrainSystem};
-
 pub fn parse_zkvm_proof_import(
     zkvm_proof: ZKVMProof<BabyBearExt4, Basefold<BabyBearExt4, BasefoldRSParams>>,
     vk: &ZKVMVerifyingKey<BabyBearExt4, Basefold<BabyBearExt4, BasefoldRSParams>>,
@@ -262,7 +241,7 @@ pub fn parse_zkvm_proof_import(
                     (
                         1,
                         SumcheckLayerProofInput {
-                            proof: iop_messages,
+                            proof: iop_messages.into(),
                             evals,
                         },
                     )
@@ -290,7 +269,7 @@ pub fn parse_zkvm_proof_import(
                 }
 
                 let main = SumcheckLayerProofInput {
-                    proof: iop_messages,
+                    proof: iop_messages.into(),
                     evals,
                 };
 

src/tower_verifier/binding.rs

@@ -157,7 +157,7 @@ impl Hintable<InnerConfig> for IOPProverMessage {
 impl VecAutoHintable for IOPProverMessage {}
 
 /// Assume that all the prover messages have the same size.
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Default)]
 pub struct IOPProverMessageVec {
     pub prover_message_size: usize,
     pub data: Vec<E>,
@@ -296,20 +296,3 @@ impl Hintable<InnerConfig> for ThreeDimensionalVector {
         stream
     }
 }
-
-pub struct TowerVerifierInput {
-    pub prod_out_evals: Vec<Vec<E>>,
-    pub logup_out_evals: Vec<Vec<E>>,
-    pub num_variables: Vec<usize>,
-    pub num_fanin: usize,
-
-    // TowerProof
-    pub num_proofs: usize,
-    pub num_prod_specs: usize,
-    pub num_logup_specs: usize,
-    pub _max_num_variables: usize,
-
-    pub proofs: Vec<Vec<IOPProverMessage>>,
-    pub prod_specs_eval: Vec<Vec<Vec<E>>>,
-    pub logup_specs_eval: Vec<Vec<Vec<E>>>,
-}

src/tower_verifier/program.rs

@@ -1,4 +1,4 @@
-use super::binding::{IOPProverMessageVariable, PointAndEvalVariable, PointVariable};
+use super::binding::{PointAndEvalVariable, PointVariable};
 use crate::arithmetics::{
     challenger_multi_observe, eq_eval, evaluate_at_point_degree_1, extend, exts_to_felts,
     fixed_dot_product, reverse, UniPolyExtrapolator,

src/zkvm_verifier/binding.rs

@@ -2,17 +2,12 @@ use crate::arithmetics::next_pow2_instance_padding;
 use crate::basefold_verifier::basefold::{
     BasefoldCommitment, BasefoldCommitmentVariable, BasefoldProof, BasefoldProofVariable,
 };
-use crate::basefold_verifier::query_phase::{
-    QueryPhaseVerifierInput, QueryPhaseVerifierInputVariable,
-};
+
 use crate::tower_verifier::binding::{
     IOPProverMessageVec, IOPProverMessageVecVariable, ThreeDimensionalVecVariable,
     ThreeDimensionalVector,
 };
-use crate::{
-    arithmetics::ceil_log2,
-    tower_verifier::binding::{IOPProverMessage, IOPProverMessageVariable, PointVariable},
-};
+use crate::{arithmetics::ceil_log2, tower_verifier::binding::PointVariable};
 use itertools::Itertools;
 use openvm_native_compiler::{
     asm::AsmConfig,
@@ -371,7 +366,7 @@ impl Hintable<InnerConfig> for ZKVMChipProofInput {
 
 #[derive(Default)]
 pub struct SumcheckLayerProofInput {
-    pub proof: Vec<IOPProverMessage>,
+    pub proof: IOPProverMessageVec,
     pub evals: Vec<E>,
 }
 #[derive(DslVariable, Clone)]

src/zkvm_verifier/verifier.rs

@@ -36,9 +36,7 @@ use ceno_mle::StructuralWitInType::{
     StackedConstantSequence, StackedIncrementalSequence,
 };
 use ceno_zkvm::structs::{VerifyingKey, ZKVMVerifyingKey};
-use ceno_zkvm::{
-    circuit_builder::SetTableSpec, scheme::verifier::ZKVMVerifier, structs::ComposedConstrainSystem,
-};
+use ceno_zkvm::{circuit_builder::SetTableSpec, structs::ComposedConstrainSystem};
 use ff_ext::BabyBearExt4;
 use gkr_iop::gkr::layer::ROTATION_OPENING_COUNT;
 use gkr_iop::{