chore: address clippy warnings

Author: MarcosNicolau

aggregation_mode/src/aggregators/lib.rs

@@ -1,6 +1,6 @@
 use super::{
-    risc0_aggregator::{self, Risc0AggregationInput, Risc0ProofReceiptAndImageId},
-    sp1_aggregator::{self, SP1AggregationInput, SP1ProofWithPubValuesAndElf},
+    risc0_aggregator::{Risc0AggregationInput, Risc0ProofReceiptAndImageId},
+    sp1_aggregator::{SP1AggregationInput, SP1ProofWithPubValuesAndElf},
 };
 
 pub enum ProgramInput {
@@ -9,8 +9,8 @@ pub enum ProgramInput {
 }
 
 pub enum AggregatedProof {
-    SP1(SP1ProofWithPubValuesAndElf),
-    Risc0(Risc0ProofReceiptAndImageId),
+    SP1(Box<SP1ProofWithPubValuesAndElf>),
+    Risc0(Box<Risc0ProofReceiptAndImageId>),
 }
 
 pub struct ProgramOutput {
@@ -30,10 +30,3 @@ pub enum ProofAggregationError {
     Risc0Proving(String),
     UnsupportedProof,
 }
-
-pub fn aggregate_proofs(input: ProgramInput) -> Result<ProgramOutput, ProofAggregationError> {
-    match input {
-        ProgramInput::SP1(input) => sp1_aggregator::aggregate_proofs(input),
-        ProgramInput::Risc0(input) => risc0_aggregator::aggregate_proofs(input),
-    }
-}

aggregation_mode/src/aggregators/mod.rs

@@ -39,8 +39,8 @@ impl ZKVMEngine {
 }
 
 pub enum AlignedProof {
-    SP1(SP1ProofWithPubValuesAndElf),
-    Risc0(Risc0ProofReceiptAndImageId),
+    SP1(Box<SP1ProofWithPubValuesAndElf>),
+    Risc0(Box<Risc0ProofReceiptAndImageId>),
 }
 
 impl AlignedProof {

aggregation_mode/src/aggregators/risc0_aggregator.rs

@@ -33,7 +33,7 @@ impl Risc0ProofReceiptAndImageId {
 impl Risc0ProofReceiptAndImageId {
     pub fn hash_image_id_and_public_inputs(&self) -> [u8; 32] {
         let mut hasher = Keccak256::new();
-        hasher.update(&self.image_id);
+        hasher.update(self.image_id);
         hasher.update(self.public_inputs());
         hasher.finalize().into()
     }
@@ -88,7 +88,7 @@ pub(crate) fn aggregate_proofs(
         receipt,
     };
 
-    Ok(ProgramOutput::new(AggregatedProof::Risc0(output)))
+    Ok(ProgramOutput::new(AggregatedProof::Risc0(output.into())))
 }
 
 #[derive(Debug)]

aggregation_mode/src/aggregators/sp1_aggregator.rs

@@ -92,7 +92,7 @@ pub(crate) fn aggregate_proofs(
         elf: PROGRAM_ELF.to_vec(),
     };
 
-    let output = ProgramOutput::new(AggregatedProof::SP1(proof_and_elf));
+    let output = ProgramOutput::new(AggregatedProof::SP1(proof_and_elf.into()));
 
     Ok(output)
 }

aggregation_mode/src/backend/fetcher.rs

@@ -119,7 +119,7 @@ impl ProofsFetcher {
                                 elf,
                             };
 
-                            Some(AlignedProof::SP1(sp1_proof))
+                            Some(AlignedProof::SP1(sp1_proof.into()))
                         }
 
                         _ => None,
@@ -138,7 +138,7 @@ impl ProofsFetcher {
                             let receipt = Receipt::new(inner_receipt, public_inputs);
                             let risc0_proof = Risc0ProofReceiptAndImageId { image_id, receipt };
 
-                            Some(AlignedProof::Risc0(risc0_proof))
+                            Some(AlignedProof::Risc0(risc0_proof.into()))
                         }
                         _ => None,
                     })

aggregation_mode/src/backend/mod.rs

@@ -118,7 +118,7 @@ impl ProofAggregator {
                 let proofs = proofs
                     .into_iter()
                     .filter_map(|proof| match proof {
-                        AlignedProof::SP1(proof) => Some(proof),
+                        AlignedProof::SP1(proof) => Some(*proof),
                         _ => None,
                     })
                     .collect();
@@ -135,7 +135,7 @@ impl ProofAggregator {
                 let proofs = proofs
                     .into_iter()
                     .filter_map(|proof| match proof {
-                        AlignedProof::Risc0(proof) => Some(proof),
+                        AlignedProof::Risc0(proof) => Some(*proof),
                         _ => None,
                     })
                     .collect();