fix: address clippy warnings

Author: MarcosNicolau

aggregation_mode/src/aggregators/mod.rs

@@ -4,13 +4,9 @@ pub mod sp1_aggregator;
 use std::fmt::Display;
 
 use lambdaworks_crypto::merkle_tree::traits::IsMerkleTreeBackend;
-use risc0_aggregator::{
-    AlignedRisc0VerificationError, Risc0AggregationError, Risc0ProofReceiptAndImageId,
-};
+use risc0_aggregator::{Risc0AggregationError, Risc0ProofReceiptAndImageId};
 use sha3::{Digest, Keccak256};
-use sp1_aggregator::{
-    AlignedSP1VerificationError, SP1AggregationError, SP1ProofWithPubValuesAndElf,
-};
+use sp1_aggregator::{SP1AggregationError, SP1ProofWithPubValuesAndElf};
 use tracing::info;
 
 #[derive(Clone, Debug)]

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -24,12 +24,11 @@ impl Risc0ProofReceiptAndImageId {
         receipt: Receipt,
     ) -> Result<Self, AlignedRisc0VerificationError> {
         let is_supported_proof =
-            proof.receipt.inner.composite().is_ok() || proof.receipt.inner.succinct().is_ok();
+            receipt.inner.composite().is_ok() || receipt.inner.succinct().is_ok();
 
         if is_supported_proof {
-            proof
-                .receipt
-                .verify(proof.image_id)
+            receipt
+                .verify(image_id)
                 .map_err(|e| AlignedRisc0VerificationError::Verification(e.to_string()))?;
         } else {
             return Err(AlignedRisc0VerificationError::UnsupportedProof);

aggregation_mode/src/aggregators/sp1_aggregator.rs

@@ -13,7 +13,9 @@ const CHUNK_PROGRAM_ELF: &[u8] =
 const USER_PROOFS_PROGRAM_ELF: &[u8] =
     include_bytes!("../../aggregation_programs/sp1/elf/sp1_user_proofs_aggregator_program");
 
+#[allow(dead_code)]
 static SP1_PROVER_CLIENT: LazyLock<EnvProver> = LazyLock::new(ProverClient::from_env);
+
 /// Separate prover instance configured to always use the CPU.
 /// This is used for verification, which is performed in parallel and
 /// cannot be done on the GPU.
@@ -49,18 +51,12 @@ impl SP1ProofWithPubValuesAndElf {
     ) -> Result<Self, AlignedSP1VerificationError> {
         let client = &*SP1_PROVER_CLIENT_CPU;
 
-        let (_pk, vk) = client.setup(&sp1_proof_with_pub_values_and_elf.elf);
+        let (_pk, vk) = client.setup(&elf);
 
         // only sp1 compressed proofs are supported for aggregation now
-        match sp1_proof_with_pub_values_and_elf
-            .proof_with_pub_values
-            .proof
-        {
+        match proof_with_pub_values.proof {
             sp1_sdk::SP1Proof::Compressed(_) => client
-                .verify(
-                    &sp1_proof_with_pub_values_and_elf.proof_with_pub_values,
-                    &vk,
-                )
+                .verify(&proof_with_pub_values, &vk)
                 .map_err(AlignedSP1VerificationError::Verification),
             _ => Err(AlignedSP1VerificationError::UnsupportedProof),
         }?;

aggregation_mode/src/backend/fetcher.rs

@@ -132,7 +132,7 @@ impl ProofsFetcher {
                         };
 
                         match sp1_proof {
-                            Ok(proof) => Some(AlignedProof::SP1(sp1_proof)),
+                            Ok(proof) => Some(AlignedProof::SP1(proof.into())),
                             Err(err) => {
                                 error!("Could not add proof, verification failed: {:?}", err);
                                 None
@@ -161,7 +161,7 @@ impl ProofsFetcher {
                         };
 
                         match risc0_proof {
-                            Ok(proof) => Some(AlignedProof::Risc0(risc0_proof)),
+                            Ok(proof) => Some(AlignedProof::Risc0(proof.into())),
                             Err(err) => {
                                 error!("Could not add proof, verification failed: {:?}", err);
                                 None