Remove serde_json_pythonic. (#1047)

* Remove `serde_json_pythonic`.

* Fix JSON formatter on `deprecated_contract_class.rs`.

* Fix hash JSON formatter (non-ascii support).

* Add unwrap reasoning comment.

Author: azteca1998

Cargo.lock

@@ -56,7 +56,6 @@ once_cell = "1.17.1"
 starknet = { workspace = true }
 base64 = { version = "0.21.0", default-features = false, features = ["alloc"] }
 flate2 = "1.0.25"
-serde_json_pythonic = "0.1.2"
 
 [dev-dependencies]
 assert_matches = "1.5.0"

Cargo.toml

@@ -158,7 +158,7 @@ impl serde_json::ser::Formatter for PythonDefaultFormatter {
             } else {
                 let buf = c.encode_utf16(&mut buf);
                 for i in buf {
-                    write!(writer, r"\u{:4x}", i)?;
+                    write!(writer, r"\u{:04x}", i)?;
                 }
             }
         }

src/core/contract_address/deprecated_contract_address.rs

@@ -4,7 +4,10 @@ use cairo_lang_starknet::{
     contract_class::{ContractClass as SierraContractClass, ContractEntryPoint},
 };
 use cairo_vm::felt::Felt252;
+use serde::Serialize;
+use serde_json::ser::Formatter;
 use starknet_crypto::{poseidon_hash_many, FieldElement, PoseidonHasher};
+use std::io::{self, Cursor};
 
 const CONTRACT_CLASS_VERSION: &[u8] = b"CONTRACT_CLASS_V0.1.0";
 
@@ -60,14 +63,22 @@ pub fn compute_sierra_class_hash(
     hasher.update(constructors);
 
     // Hash abi
-    let abi = serde_json_pythonic::to_string_pythonic(
-        &contract_class
+    let abi = {
+        let mut buf = Cursor::new(Vec::new());
+        let mut fmt = serde_json::Serializer::with_formatter(&mut buf, PythonJsonFormatter);
+
+        contract_class
             .abi
             .as_ref()
             .ok_or(ContractAddressError::MissingAbi)?
-            .items,
-    )
-    .map_err(|_| ContractAddressError::MissingAbi)?;
+            .items
+            .serialize(&mut fmt)
+            .map_err(|_| ContractAddressError::MissingAbi)?;
+
+        // Note: The following unwrap should never be triggered as long as serde_json generates
+        //   UTF-8 encoded data, which in practice means it should never panic.
+        String::from_utf8(buf.into_inner()).unwrap()
+    };
 
     let abi_hash = FieldElement::from_byte_slice_be(&starknet_keccak(abi.as_bytes()).to_bytes_be())
         .map_err(|_err| {
@@ -143,3 +154,56 @@ mod tests {
         )
     }
 }
+
+struct PythonJsonFormatter;
+
+impl Formatter for PythonJsonFormatter {
+    fn begin_array_value<W>(&mut self, writer: &mut W, first: bool) -> io::Result<()>
+    where
+        W: ?Sized + io::Write,
+    {
+        if first {
+            Ok(())
+        } else {
+            writer.write_all(b", ")
+        }
+    }
+
+    fn begin_object_key<W>(&mut self, writer: &mut W, first: bool) -> io::Result<()>
+    where
+        W: ?Sized + io::Write,
+    {
+        if first {
+            Ok(())
+        } else {
+            writer.write_all(b", ")
+        }
+    }
+
+    fn begin_object_value<W>(&mut self, writer: &mut W) -> io::Result<()>
+    where
+        W: ?Sized + io::Write,
+    {
+        writer.write_all(b": ")
+    }
+
+    fn write_string_fragment<W>(&mut self, writer: &mut W, fragment: &str) -> io::Result<()>
+    where
+        W: ?Sized + io::Write,
+    {
+        let mut buf = [0, 0];
+
+        for c in fragment.chars() {
+            if c.is_ascii() {
+                writer.write_all(&[c as u8])?;
+            } else {
+                let buf = c.encode_utf16(&mut buf);
+                for i in buf {
+                    write!(writer, r"\u{i:04x}")?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+}