♻️ refactor types

crates/cli/src/user_cli.rs

@@ -1,7 +1,6 @@
 use askeladd::config::Settings;
 use askeladd::dvm::customer::Customer;
-use askeladd::dvm::types::GenerateZKPJobRequest;
-use askeladd::types::FibonnacciProvingRequest;
+use askeladd::dvm::types::{FibonnacciProvingRequest, GenerateZKPJobRequest};
 use dotenv::dotenv;
 use log::info;
 

crates/core/src/db.rs

@@ -1,6 +1,6 @@
 use rusqlite::{params, Connection, Result};
 
-use crate::types::{FibonnacciProvingRequest, FibonnacciProvingResponse};
+use crate::dvm::types::{FibonnacciProvingRequest, FibonnacciProvingResponse};
 
 pub struct Database {
     conn: Connection,

crates/core/src/dvm/mod.rs

@@ -13,10 +13,9 @@ pub mod constants {
 
 pub mod types {
     use serde::{Deserialize, Serialize};
+    use stwo_prover::core::prover::StarkProof;
     use uuid::Uuid;
 
-    use crate::types::{FibonnacciProvingRequest, FibonnacciProvingResponse};
-
     #[derive(Debug, Serialize, Deserialize, Clone)]
     pub struct GenerateZKPJobRequest {
         pub job_id: String,
@@ -48,4 +47,42 @@ pub mod types {
         pub job_id: String,
         pub response: FibonnacciProvingResponse,
     }
+
+    #[derive(Debug, Serialize, Deserialize, Clone)]
+    pub struct FibonnacciProvingRequest {
+        pub log_size: u32,
+        pub claim: u32,
+    }
+
+    #[derive(Debug, Serialize, Deserialize)]
+    pub struct FibonnacciProvingResponse {
+        pub log_size: u32,
+        pub claim: u32,
+        pub proof: StarkProof,
+    }
+
+    impl FibonnacciProvingResponse {
+        pub fn new(log_size: u32, claim: u32, proof: StarkProof) -> Self {
+            Self {
+                log_size,
+                claim,
+                proof,
+            }
+        }
+    }
+
+    impl Clone for FibonnacciProvingResponse {
+        fn clone(&self) -> Self {
+            // Temporarily use serde for a dirty clone
+            // TODO: Implement a proper clone or find a better design that does not require cloning
+            // the proof
+            let proof_json = serde_json::to_string(&self.proof).unwrap();
+            let proof = serde_json::from_str(&proof_json).unwrap();
+            Self {
+                log_size: self.log_size,
+                claim: self.claim,
+                proof,
+            }
+        }
+    }
 }

crates/core/src/lib.rs

@@ -2,5 +2,4 @@ pub mod config;
 pub mod db;
 pub mod dvm;
 pub mod prover_service;
-pub mod types;
 pub mod verifier_service;

crates/core/src/prover_service.rs

@@ -2,7 +2,7 @@ use stwo_prover::core::fields::m31::BaseField;
 use stwo_prover::core::prover::ProvingError;
 use stwo_prover::examples::fibonacci::Fibonacci;
 
-use crate::types::{FibonnacciProvingRequest, FibonnacciProvingResponse};
+use crate::dvm::types::{FibonnacciProvingRequest, FibonnacciProvingResponse};
 
 #[derive(Debug, Default)]
 pub struct ProverService {}

crates/core/src/verifier_service.rs

@@ -2,7 +2,7 @@ use stwo_prover::core::fields::m31::BaseField;
 use stwo_prover::core::prover::VerificationError;
 use stwo_prover::examples::fibonacci::Fibonacci;
 
-use crate::types::FibonnacciProvingResponse;
+use crate::dvm::types::FibonnacciProvingResponse;
 
 #[derive(Debug, Default)]
 pub struct VerifierService {}