From bdddfbd7fcf385bda629baf696081cb1deae75de Mon Sep 17 00:00:00 2001 From: Ho Date: Sat, 8 Nov 2025 17:01:41 +0900 Subject: [PATCH] fmt --- crates/libzkp/src/tasks.rs | 3 +-- crates/libzkp/src/tasks/batch.rs | 31 +++++++++++++++++-------------- crates/libzkp/src/tasks/bundle.rs | 5 ++++- crates/libzkp/src/tasks/chunk.rs | 3 ++- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/crates/libzkp/src/tasks.rs b/crates/libzkp/src/tasks.rs index 741455d8f..245d4ca53 100644 --- a/crates/libzkp/src/tasks.rs +++ b/crates/libzkp/src/tasks.rs @@ -24,8 +24,7 @@ fn encode_task_to_witness(task: &T) -> eyre::Result fn check_aggregation_proofs( metadata: &[Metadata], version: Version, -) -> eyre::Result<()> -{ +) -> eyre::Result<()> { panic_catch(|| { for w in metadata.windows(2) { w[1].validate(&w[0], version); diff --git a/crates/libzkp/src/tasks/batch.rs b/crates/libzkp/src/tasks/batch.rs index b160a093a..0348e56c8 100644 --- a/crates/libzkp/src/tasks/batch.rs +++ b/crates/libzkp/src/tasks/batch.rs @@ -237,20 +237,20 @@ impl BatchProvingTask { // patch: ensure block_hash field is ZERO for scroll domain let chunk_infos = self - .chunk_proofs - .iter() - .map(|p| - if version.domain == Domain::Scroll { - ChunkInfo { - prev_blockhash: B256::ZERO, - post_blockhash: B256::ZERO, - ..p.metadata.chunk_info.clone() - } - } else { - p.metadata.chunk_info.clone() + .chunk_proofs + .iter() + .map(|p| { + if version.domain == Domain::Scroll { + ChunkInfo { + prev_blockhash: B256::ZERO, + post_blockhash: B256::ZERO, + ..p.metadata.chunk_info.clone() } - ).collect(); - + } else { + p.metadata.chunk_info.clone() + } + }) + .collect(); BatchWitness { version: version.as_version_byte(), @@ -269,7 +269,10 @@ impl BatchProvingTask { // 2. validate every adjacent proof pair let witness = self.build_guest_input(); let metadata = BatchInfo::from(&witness); - super::check_aggregation_proofs(witness.chunk_infos.as_slice(), Version::from(self.version))?; + super::check_aggregation_proofs( + witness.chunk_infos.as_slice(), + Version::from(self.version), + )?; Ok(metadata) } diff --git a/crates/libzkp/src/tasks/bundle.rs b/crates/libzkp/src/tasks/bundle.rs index a12e03f7c..609526aac 100644 --- a/crates/libzkp/src/tasks/bundle.rs +++ b/crates/libzkp/src/tasks/bundle.rs @@ -63,7 +63,10 @@ impl BundleProvingTask { // 2. validate every adjacent proof pair let witness = self.build_guest_input(); let metadata = BundleInfo::from(&witness); - super::check_aggregation_proofs(witness.batch_infos.as_slice(), Version::from(self.version))?; + super::check_aggregation_proofs( + witness.batch_infos.as_slice(), + Version::from(self.version), + )?; Ok(metadata) } diff --git a/crates/libzkp/src/tasks/chunk.rs b/crates/libzkp/src/tasks/chunk.rs index ce0304b68..aa6751486 100644 --- a/crates/libzkp/src/tasks/chunk.rs +++ b/crates/libzkp/src/tasks/chunk.rs @@ -33,7 +33,8 @@ impl TryFromWithInterpreter for ChunkProvingTask { ) -> Result { let mut block_witnesses = Vec::new(); for block_hash in value.block_hashes { - let witness = interpreter.try_fetch_block_witness(block_hash, block_witnesses.last())?; + let witness = + interpreter.try_fetch_block_witness(block_hash, block_witnesses.last())?; block_witnesses.push(witness); }