good

succinctlabs · Dec 20, 2024 · c018bef · c018bef
1 parent 9bdf767
commit c018bef
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 60 deletions.
diff --git a/crates/sdk/src/network/mod.rs b/crates/sdk/src/network/mod.rs
@@ -4,7 +4,6 @@
 
 pub mod client;
 pub mod prover;
-mod sign_message;
 #[rustfmt::skip]
 #[allow(missing_docs)]
 #[allow(clippy::default_trait_access)]

diff --git a/crates/sdk/src/network/prove.rs b/crates/sdk/src/network/prove.rs
@@ -284,8 +284,11 @@ impl<'a> NetworkProveBuilder<'a> {
     ///     .unwrap();
     /// ```
     pub async fn request(self) -> Result<Vec<u8>> {
-        let Self { prover, mode, pk, stdin, timeout, strategy, skip_simulation, cycle_limit } = self;
-        prover.request_proof_impl(pk, &stdin, mode, strategy, timeout, skip_simulation, cycle_limit).await
+        let Self { prover, mode, pk, stdin, timeout, strategy, skip_simulation, cycle_limit } =
+            self;
+        prover
+            .request_proof_impl(pk, &stdin, mode, strategy, timeout, skip_simulation, cycle_limit)
+            .await
     }
 
     /// Run the prover with the built arguments.
@@ -308,7 +311,8 @@ impl<'a> NetworkProveBuilder<'a> {
     ///     .unwrap();
     /// ```
     pub fn run(self) -> Result<SP1ProofWithPublicValues> {
-        let Self { prover, mode, pk, stdin, timeout, strategy, mut skip_simulation, cycle_limit } = self;
+        let Self { prover, mode, pk, stdin, timeout, strategy, mut skip_simulation, cycle_limit } =
+            self;
 
         // Check for deprecated environment variable
         if let Ok(val) = std::env::var("SKIP_SIMULATION") {
@@ -320,7 +324,15 @@ impl<'a> NetworkProveBuilder<'a> {
 
         sp1_dump(&pk.elf, &stdin);
 
-        block_on(prover.prove_impl(pk, &stdin, mode, strategy, timeout, skip_simulation, cycle_limit))
+        block_on(prover.prove_impl(
+            pk,
+            &stdin,
+            mode,
+            strategy,
+            timeout,
+            skip_simulation,
+            cycle_limit,
+        ))
     }
 
     /// Run the prover with the built arguments asynchronously.
@@ -341,7 +353,8 @@ impl<'a> NetworkProveBuilder<'a> {
     ///     .run_async();
     /// ```
     pub async fn run_async(self) -> Result<SP1ProofWithPublicValues> {
-        let Self { prover, mode, pk, stdin, timeout, strategy, mut skip_simulation, cycle_limit } = self;
+        let Self { prover, mode, pk, stdin, timeout, strategy, mut skip_simulation, cycle_limit } =
+            self;
 
         // Check for deprecated environment variable
         if let Ok(val) = std::env::var("SKIP_SIMULATION") {

diff --git a/crates/sdk/src/network/prover.rs b/crates/sdk/src/network/prover.rs
@@ -9,6 +9,7 @@ use super::prove::NetworkProveBuilder;
 use super::DEFAULT_CYCLE_LIMIT;
 use crate::cpu::execute::CpuExecuteBuilder;
 use crate::cpu::CpuProver;
+use crate::network::proto::network::GetProofRequestStatusResponse;
 use crate::network::{Error, DEFAULT_PROVER_NETWORK_RPC, DEFAULT_TIMEOUT_SECS};
 use crate::{
     network::client::NetworkClient,

diff --git a/crates/sdk/src/network/utils.rs b/crates/sdk/src/network/utils.rs
@@ -1,11 +1,11 @@
+#![allow(deprecated)]
+
 //! # Network Utils
 //!
 //! This module provides utility functions for the network module.
 
 use alloy_signer::{Signature, SignerSync};
 use prost::Message;
-use serde::Serialize;
-use thiserror::Error;
 
 pub(crate) trait Signable: Message {
     fn sign<S: SignerSync>(&self, signer: &S) -> Signature;
@@ -16,55 +16,3 @@ impl<T: Message> Signable for T {
         signer.sign_message_sync(&self.encode_to_vec()).unwrap()
     }
 }
-
-#[derive(Error, Debug)]
-pub(crate) enum JsonFormatError {
-    #[error("Serialization error: {0}")]
-    SerializationError(String),
-}
-
-pub(crate) fn format_json_message<T>(body: &T) -> Result<Vec<u8>, JsonFormatError>
-where
-    T: Message + Serialize,
-{
-    match serde_json::to_string(body) {
-        Ok(json_str) => {
-            if json_str.starts_with('"') && json_str.ends_with('"') {
-                let inner = &json_str[1..json_str.len() - 1];
-                let unescaped = inner.replace("\\\"", "\"");
-                Ok(unescaped.into_bytes())
-            } else {
-                Ok(json_str.into_bytes())
-            }
-        }
-        Err(e) => Err(JsonFormatError::SerializationError(e.to_string())),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use prost::Message as ProstMessage;
-    use serde::{Deserialize, Serialize};
-
-    // Test message for JSON formatting.
-    #[derive(Clone, ProstMessage, Serialize, Deserialize)]
-    struct TestMessage {
-        #[prost(string, tag = 1)]
-        value: String,
-    }
-
-    #[test]
-    fn test_format_json_message_simple() {
-        let msg = TestMessage { value: "hello".to_string() };
-        let result = format_json_message(&msg).unwrap();
-        assert_eq!(result, b"{\"value\":\"hello\"}");
-    }
-
-    #[test]
-    fn test_format_json_message_with_quotes() {
-        let msg = TestMessage { value: "hello \"world\"".to_string() };
-        let result = format_json_message(&msg).unwrap();
-        assert_eq!(result, b"{\"value\":\"hello \\\"world\\\"\"}");
-    }
-}