fix rebase master

Author: lightsing

crates/integration/src/testers/bundle.rs

@@ -133,7 +133,7 @@ impl BundleTaskGenerator {
                     .iter()
                     .map(|&b| b as u32)
                     .collect::<Vec<_>>(),
-                commitment: commitment.clone(),
+                commitment,
             };
             batch_proofs.push(proof);
             batch_infos.push(info);

crates/integration/src/testers/chunk.rs

@@ -1,14 +1,13 @@
 use crate::{
-    PartialProvingTask, ProverTester, TaskProver, guest_version, prove_verify, testdata_fork_directory,
-    tester_execute, testers::PATH_TESTDATA, testing_hardfork, testing_version,
-    utils::metadata_from_chunk_witnesses,
+    GUEST_VERSION, PartialProvingTask, ProverTester, TaskProver, prove_verify,
+    testdata_fork_directory, tester_execute, testers::PATH_TESTDATA, testing_hardfork,
+    testing_version, utils::metadata_from_chunk_witnesses,
 };
-use openvm_sdk::StdIn;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use sbv_core::BlockWitness;
 use sbv_primitives::{B256, types::consensus::TxL1Message};
+use scroll_zkvm_prover::utils::read_json;
 use scroll_zkvm_prover::utils::vm::ExecutionResult;
-use scroll_zkvm_prover::{Prover, utils::read_json};
 use scroll_zkvm_types::chunk::ChunkWitnessUpgradeCompact;
 use scroll_zkvm_types::{
     chunk::{ChunkInfo, ChunkWitness, LegacyChunkWitness, SecretKey},
@@ -20,12 +19,6 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{
-    PartialProvingTask, ProverTester, prove_verify, testdata_fork_directory, tester_execute,
-    testers::PATH_TESTDATA, testing_hardfork, testing_version,
-    utils::metadata_from_chunk_witnesses,
-};
-
 /// Load a file <block_n>.json in the <PATH_BLOCK_WITNESS> directory.
 pub fn read_block_witness_from_testdata(block_n: usize) -> eyre::Result<BlockWitness> {
     read_block_witness(
@@ -74,11 +67,11 @@ impl PartialProvingTask for ChunkWitness {
         Ok(bytes.to_vec())
     }
 
-    fn write_guest_input(&self, stdin: &mut StdIn) -> eyre::Result<()>
+    fn archive(&self) -> eyre::Result<Vec<u8>>
     where
         Self: Sized,
     {
-        let bytes: Vec<u8> = match guest_version().as_str() {
+        let bytes: Vec<u8> = match GUEST_VERSION.as_ref() {
             "0.5.2" => self.legacy_rkyv_archive()?,
             "0.6.0-rc.6" => {
                 let config = bincode::config::standard();
@@ -92,8 +85,7 @@ impl PartialProvingTask for ChunkWitness {
                 bincode::serde::encode_to_vec(self, config)?
             }
         };
-        stdin.write_bytes(&bytes);
-        Ok(())
+        Ok(bytes)
     }
 
     fn fork_name(&self) -> ForkName {

crates/integration/src/utils/mod.rs

@@ -322,7 +322,7 @@ pub fn build_batch_witnesses(
                     .iter()
                     .map(|&b| b as u32)
                     .collect::<Vec<_>>(),
-                commitment: commitment.clone(),
+                commitment,
             }
         })
         .collect::<Vec<_>>();
@@ -395,7 +395,7 @@ pub fn build_batch_witnesses_validium(
                     .iter()
                     .map(|&b| b as u32)
                     .collect::<Vec<_>>(),
-                commitment: commitment.clone(),
+                commitment,
             }
         })
         .collect::<Vec<_>>();