fix(graphql): Call to/from encodings instead of calling serde

Author: Adrian Nagy

mina-p2p-messages/src/v2/manual.rs

@@ -1006,11 +1006,6 @@ impl MinaBaseSignedCommandStableV2 {
 }
 
 /// TODO(adonagy): implement the base64 conversions similarly to the base58check ones (versioned/not versioned)
-#[derive(Debug, Clone)]
-pub struct MinaBaseZkappCommandTStableV1WireStableV1Base64(
-    pub MinaBaseZkappCommandTStableV1WireStableV1,
-);
-
 impl MinaBaseZkappCommandTStableV1WireStableV1 {
     pub fn to_base64(&self) -> Result<String, conv::Error> {
         const ZKAPP_VERSION_TAG: u8 = 1;
@@ -1034,51 +1029,6 @@ impl MinaBaseZkappCommandTStableV1WireStableV1 {
     }
 }
 
-impl From<MinaBaseZkappCommandTStableV1WireStableV1>
-    for MinaBaseZkappCommandTStableV1WireStableV1Base64
-{
-    fn from(value: MinaBaseZkappCommandTStableV1WireStableV1) -> Self {
-        Self(value)
-    }
-}
-
-impl Serialize for MinaBaseZkappCommandTStableV1WireStableV1Base64 {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        if serializer.is_human_readable() {
-            let base64_data = self.0.to_base64().map_err(serde::ser::Error::custom)?;
-            serializer.serialize_str(&base64_data)
-        } else {
-            self.0.serialize(serializer)
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for MinaBaseZkappCommandTStableV1WireStableV1Base64 {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let deserialised = if deserializer.is_human_readable() {
-            use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine as _};
-            let base64_data = String::deserialize(deserializer)?;
-            STANDARD_NO_PAD
-                .decode(&base64_data)
-                .map_err(|e| serde::de::Error::custom(format!("Error deserializing zkapp: {e}")))?
-        } else {
-            Deserialize::deserialize(deserializer)?
-        };
-
-        let res =
-            MinaBaseZkappCommandTStableV1WireStableV1::binprot_read(&mut deserialised.as_slice())
-                .map_err(|e| serde::de::Error::custom(format!("Error deserializing zkapp: {e}")))?;
-
-        Ok(Self(res))
-    }
-}
-
 impl Serialize for ConsensusBodyReferenceStableV1 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -1721,8 +1671,7 @@ mod test {
     use binprot::BinProtRead;
 
     use crate::v2::{
-        MinaBaseVerificationKeyWireStableV1, MinaBaseZkappCommandTStableV1WireStableV1,
-        MinaBaseZkappCommandTStableV1WireStableV1Base64,
+        MinaBaseVerificationKeyWireStableV1, MinaBaseZkappCommandTStableV1WireStableV1
     };
 
     #[test]
@@ -1732,12 +1681,8 @@ mod test {
         let zkapp =
             MinaBaseZkappCommandTStableV1WireStableV1::binprot_read(&mut bytes.as_slice()).unwrap();
 
-        let zkapp_id = MinaBaseZkappCommandTStableV1WireStableV1Base64::from(zkapp);
-
-        let zkapp_id_string = serde_json::to_string_pretty(&zkapp_id).unwrap();
-        let zkapp_id_string = zkapp_id_string.trim_matches('"');
-
-        assert_eq!(expexcted, zkapp_id_string);
+        let zkapp_id = zkapp.to_base64().unwrap();
+        assert_eq!(expexcted, zkapp_id);
     }
 
     #[test]
@@ -1748,7 +1693,7 @@ mod test {
 
         let decoded = STANDARD.decode(verification_key_encoded).unwrap();
         let verification_key =
-            MinaBaseVerificationKeyWireStableV1::binprot_read(&mut decoded.as_slice()).unwrap();
-        println!("{:?}", verification_key);
+            MinaBaseVerificationKeyWireStableV1::binprot_read(&mut decoded.as_slice());
+        assert!(verification_key.is_ok());
     }
 }

node/native/src/graphql/block.rs

@@ -1,5 +1,4 @@
 use juniper::GraphQLObject;
-use mina_p2p_messages::v2::MinaBaseZkappCommandTStableV1WireStableV1Base64;
 use openmina_core::block::AppliedBlock;
 
 use crate::graphql::zkapp::{GraphQLFailureReason, GraphQLFeePayer, GraphQLZkappCommand};
@@ -172,15 +171,9 @@ impl TryFrom<mina_p2p_messages::v2::StagedLedgerDiffDiffDiffStableV2> for GraphQ
                     Ok(Some(GraphQLZkapp {
                         hash: zkapp.hash()?.to_string(),
                         failure_reason,
-                        id: serde_json::to_string_pretty(
-                            &MinaBaseZkappCommandTStableV1WireStableV1Base64::from(zkapp.clone()),
-                        )?
-                        .trim_matches('"')
-                        .to_string(),
+                        id: zkapp.to_base64()?,
                         zkapp_command: GraphQLZkappCommand {
-                            memo: serde_json::to_string_pretty(&zkapp.memo)?
-                                .trim_matches('"')
-                                .to_string(),
+                            memo: zkapp.memo.to_base58check(),
                             account_updates,
                             fee_payer: GraphQLFeePayer::from(zkapp.fee_payer),
                         },