Restore command field in sncast json responses

crates/sncast/src/response/account/create.rs

@@ -9,7 +9,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::{Serialize, Serializer};
 use serde_json::Value;
-use serde_json::json;
 
 fn as_str<S>(value: &u128, serializer: S) -> Result<S::Ok, S::Error>
 where
@@ -48,13 +47,7 @@ impl Message for SncastMessage<AccountCreateResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 

crates/sncast/src/response/account/delete.rs

@@ -4,7 +4,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 
 #[derive(Serialize, Clone)]
 pub struct AccountDeleteResponse {
@@ -23,12 +22,6 @@ impl Message for SncastMessage<AccountDeleteResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/account/deploy.rs

@@ -9,7 +9,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use serde_json::json;
 #[derive(Serialize, Deserialize, CairoSerialize, Clone, Debug, PartialEq)]
 pub struct AccountDeployResponse {
     pub transaction_hash: PaddedFelt,
@@ -37,13 +36,7 @@ impl Message for SncastMessage<AccountDeployResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 

crates/sncast/src/response/account/import.rs

@@ -4,7 +4,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 
 #[derive(Serialize, Clone)]
 pub struct AccountImportResponse {
@@ -28,12 +27,6 @@ impl Message for SncastMessage<AccountImportResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/call.rs

@@ -6,7 +6,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 use starknet_types_core::felt::Felt;
 
 #[derive(Serialize, CairoSerialize, Clone)]
@@ -34,12 +33,6 @@ impl Message for SncastMessage<CallResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/cast_message.rs

@@ -6,3 +6,31 @@ pub struct SncastMessage<T: CommandResponse> {
     pub command: String,
     pub command_response: T,
 }
+
+impl<T: CommandResponse> SncastMessage<T> {
+    pub fn to_json(&self) -> serde_json::Value {
+        match serde_json::to_value(&self.command_response) {
+            Ok(serde_json::Value::Object(mut map)) => {
+                map.insert(
+                    "command".to_string(),
+                    serde_json::Value::String(self.command.clone()),
+                );
+                serde_json::Value::Object(map)
+            }
+            Ok(other) => {
+                serde_json::json!({
+                    "error": "Expected a map for `command_response`",
+                    "command": self.command,
+                    "details": other.to_string()
+                })
+            }
+            Err(err) => {
+                serde_json::json!({
+                    "error": "Failed to serialize response",
+                    "command": self.command,
+                    "details": err.to_string()
+                })
+            }
+        }
+    }
+}

crates/sncast/src/response/declare.rs

@@ -8,7 +8,6 @@ use foundry_ui::styling;
 use indoc::formatdoc;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use serde_json::json;
 #[derive(Clone, Serialize, Deserialize, CairoSerialize, Debug, PartialEq)]
 pub struct DeclareTransactionResponse {
     pub class_hash: PaddedFelt,
@@ -34,13 +33,7 @@ impl Message for SncastMessage<DeclareTransactionResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 
@@ -64,13 +57,7 @@ impl Message for SncastMessage<AlreadyDeclaredResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 
@@ -105,13 +92,7 @@ impl Message for SncastMessage<DeclareResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 

crates/sncast/src/response/deploy.rs

@@ -6,7 +6,6 @@ use foundry_ui::styling;
 use indoc::formatdoc;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use serde_json::json;
 
 use super::{command::CommandResponse, explorer_link::OutputLink};
 use crate::response::cast_message::SncastMessage;
@@ -36,13 +35,7 @@ impl Message for SncastMessage<DeployResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 

crates/sncast/src/response/invoke.rs

@@ -8,7 +8,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use serde_json::json;
 
 #[derive(Serialize, Deserialize, CairoSerialize, Clone, Debug, PartialEq)]
 pub struct InvokeResponse {
@@ -30,13 +29,7 @@ impl Message for SncastMessage<InvokeResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 

crates/sncast/src/response/multicall/new.rs

@@ -5,7 +5,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 
 #[derive(Serialize, Clone)]
 pub struct MulticallNewResponse {
@@ -26,12 +25,6 @@ impl Message for SncastMessage<MulticallNewResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/multicall/run.rs

@@ -11,7 +11,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use serde_json::json;
 
 #[derive(Serialize, Deserialize, CairoSerialize, Clone, Debug, PartialEq)]
 pub struct MulticallRunResponse {
@@ -33,13 +32,7 @@ impl Message for SncastMessage<MulticallRunResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }
 

crates/sncast/src/response/script/init.rs

@@ -4,7 +4,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 
 #[derive(Serialize, Clone)]
 pub struct ScriptInitResponse {
@@ -23,12 +22,6 @@ impl Message for SncastMessage<ScriptInitResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/script/run.rs

@@ -4,7 +4,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 
 #[derive(Serialize, Debug, Clone)]
 pub struct ScriptRunResponse {
@@ -29,12 +28,6 @@ impl Message for SncastMessage<ScriptRunResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/serialize.rs

@@ -5,7 +5,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use serde_json::json;
 use starknet_types_core::felt::Felt;
 
 #[derive(Serialize, Deserialize, CairoSerialize, Clone, Debug, PartialEq)]
@@ -25,12 +24,6 @@ impl Message for SncastMessage<SerializeResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/show_config.rs

@@ -4,7 +4,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 
 use super::command::CommandResponse;
 use crate::response::cast_message::SncastMessage;
@@ -67,12 +66,6 @@ impl Message for SncastMessage<ShowConfigResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }

crates/sncast/src/response/transformed_call.rs

@@ -8,7 +8,6 @@ use foundry_ui::Message;
 use foundry_ui::styling;
 use serde::Serialize;
 use serde_json::Value;
-use serde_json::json;
 use starknet::core::types::{ContractClass, contract::AbiEntry};
 use starknet_types_core::felt::Felt;
 
@@ -39,13 +38,7 @@ impl Message for SncastMessage<TransformedCallResponse> {
     }
 
     fn json(&self) -> Value {
-        serde_json::to_value(&self.command_response).unwrap_or_else(|err| {
-            json!({
-                "error": "Failed to serialize response",
-                "command": self.command,
-                "details": err.to_string()
-            })
-        })
+        self.to_json()
     }
 }