refactor: folder structure

Author: MarcosNicolau

aggregation-mode/Cargo.toml

@@ -11,6 +11,7 @@ serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
 tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
+bincode = "1.3.3"
 
 [build-dependencies]
 sp1-build = { version = "4.1.3" } 

aggregation-mode/src/lib.rs

@@ -1,5 +1 @@
-mod aggregator;
-
-pub use aggregator::interface::{
-    aggregate_proofs, AggregatedVerificationError, InputProofs, ProgramInput, ProgramOutput,
-};
+pub mod zk;

aggregation-mode/src/zk/backends/mod.rs

@@ -0,0 +1 @@
+pub mod sp1;

aggregation-mode/src/aggregator/sp1.rs aggregation-mode/src/zk/backends/sp1.rsaggregation-mode/src/aggregator/sp1.rs renamed to aggregation-mode/src/zk/backends/sp1.rs

@@ -1,8 +1,10 @@
 use sp1_sdk::{Prover, ProverClient, SP1ProofWithPublicValues, SP1Stdin, SP1VerifyingKey};
 
-use super::interface::{AggregatedProof, AggregatedVerificationError, ProgramOutput};
+use crate::zk::interface::aggregator::{
+    AggregatedProof, AggregatedVerificationError, ProgramOutput,
+};
 
-const PROGRAM_ELF: &[u8] = include_bytes!("../../zkvm/sp1/elf/sp1_aggregator_program");
+const PROGRAM_ELF: &[u8] = include_bytes!("../../../zkvm/sp1/elf/sp1_aggregator_program");
 
 // TODO lock prover
 

…egation-mode/src/aggregator/interface.rs …tion-mode/src/zk/interface/aggregator.rsaggregation-mode/src/aggregator/interface.rs renamed to aggregation-mode/src/zk/interface/aggregator.rs aggregation-mode/src/aggregator/interface.rs renamed to aggregation-mode/src/zk/interface/aggregator.rs

@@ -1,4 +1,4 @@
-use super::sp1::{self, SP1AggregatedProof, SP1Proof, SP1VerificationError};
+use crate::zk::backends::sp1::{self, SP1AggregatedProof};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
@@ -36,17 +36,3 @@ pub fn aggregate_proofs(input: ProgramInput) -> Result<ProgramOutput, Aggregated
         ProgramInput::SP1(input) => sp1::aggregate_proofs(input),
     }
 }
-
-enum Proof {
-    SP1(SP1Proof),
-}
-
-enum VerificationError {
-    SP1(SP1VerificationError),
-}
-
-pub fn verify_proof(proof: &Proof) -> Result<(), VerificationError> {
-    match proof {
-        Proof::SP1(proof) => sp1::verify(proof).map_err(VerificationError::SP1),
-    }
-}

aggregation-mode/src/zk/interface/mod.rs

@@ -0,0 +1,2 @@
+pub mod aggregator;
+pub mod verifier;

aggregation-mode/src/zk/interface/verifier.rs

@@ -0,0 +1,15 @@
+use crate::zk::backends::sp1::{self, SP1Proof, SP1VerificationError};
+
+pub enum Proof {
+    SP1(SP1Proof),
+}
+
+pub enum VerificationError {
+    SP1(SP1VerificationError),
+}
+
+pub fn verify_proof(proof: &Proof) -> Result<(), VerificationError> {
+    match proof {
+        Proof::SP1(proof) => sp1::verify(proof).map_err(VerificationError::SP1),
+    }
+}

aggregation-mode/src/aggregator/mod.rs aggregation-mode/src/zk/mod.rsaggregation-mode/src/aggregator/mod.rs renamed to aggregation-mode/src/zk/mod.rs

@@ -1,2 +1,2 @@
+mod backends;
 pub mod interface;
-pub mod sp1;