refactor: more explicit names in sp1 aggregator program

Author: MarcosNicolau

aggregation_mode/aggregation_programs/sp1/src/lib.rs

@@ -2,12 +2,12 @@ use serde::{Deserialize, Serialize};
 use sha3::{Digest, Keccak256};
 
 #[derive(Serialize, Deserialize)]
-pub struct SP1ProofInput {
+pub struct SP1VkAndPubInputs {
     pub vk: [u32; 8],
     pub public_inputs: Vec<u8>,
 }
 
-impl SP1ProofInput {
+impl SP1VkAndPubInputs {
     pub fn hash(&self) -> [u8; 32] {
         let mut hasher = Keccak256::new();
         for &word in &self.vk {
@@ -19,20 +19,20 @@ impl SP1ProofInput {
 }
 
 #[derive(Serialize, Deserialize)]
-pub enum ProofInput {
-    SP1Compressed(SP1ProofInput),
+pub enum ProofDataInput {
+    SP1Compressed(SP1VkAndPubInputs),
 }
 
-impl ProofInput {
+impl ProofDataInput {
     pub fn hash(&self) -> [u8; 32] {
         match self {
-            ProofInput::SP1Compressed(proof) => proof.hash(),
+            ProofDataInput::SP1Compressed(proof_data) => proof_data.hash(),
         }
     }
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct Input {
-    pub proofs: Vec<ProofInput>,
+    pub proofs_data: Vec<ProofDataInput>,
     pub merkle_root: [u8; 32],
 }

aggregation_mode/src/aggregators/sp1_aggregator.rs

@@ -1,7 +1,7 @@
 use std::sync::LazyLock;
 
 use alloy::primitives::Keccak256;
-use sp1_aggregation_program::{ProofInput, SP1ProofInput};
+use sp1_aggregation_program::{ProofDataInput, SP1VkAndPubInputs};
 use sp1_sdk::{
     EnvProver, HashableKey, Prover, ProverClient, SP1ProofWithPublicValues, SP1Stdin,
     SP1VerifyingKey,
@@ -45,15 +45,15 @@ pub(crate) fn aggregate_proofs(
     let mut stdin = SP1Stdin::new();
 
     let mut program_input = sp1_aggregation_program::Input {
-        proofs: vec![],
+        proofs_data: vec![],
         merkle_root: input.merkle_root,
     };
 
     // write vk + public inputs
     for proof in input.proofs.iter() {
         program_input
-            .proofs
-            .push(ProofInput::SP1Compressed(SP1ProofInput {
+            .proofs_data
+            .push(ProofDataInput::SP1Compressed(SP1VkAndPubInputs {
                 public_inputs: proof.proof_with_pub_values.public_values.to_vec(),
                 vk: proof.vk().hash_u32(),
             }));