Use ustr serde implementation (#1192)

.gitignore

@@ -50,5 +50,6 @@ examples/backtest/notebooks/catalog
 nautilus_trader/**/.gitignore
 nautilus_trader/test_kit/mocks/.nautilus/
 tests/test_data/catalog/
+bench_data/
 
 !tests/integration_tests/adapters/betfair/responses/*.log

nautilus_core/Cargo.toml

@@ -37,7 +37,7 @@ strum = { version = "0.25.0", features = ["derive"] }
 thiserror = "1.0.44"
 tracing = "0.1.37"
 tokio = { version = "1.29.1", features = ["full"] }
-ustr = "0.10.0"
+ustr = { git = "https://github.com/anderslanglands/ustr", features = ["serde"] }
 uuid = { version = "1.4.1", features = ["v4"] }
 
 # dev-dependencies

nautilus_core/common/cbindgen.toml

@@ -11,7 +11,7 @@ rename_variants = "ScreamingSnakeCase"
 
 [export.rename]
 "bool" = "uint8_t"
-"SerializableUstr" = "char*"
+"Ustr" = "char*"
 "UnixNanos" = "uint64_t"
 "TimedeltaNanos" = "int64_t"
 "TimeEvent" = "TimeEvent_t"

nautilus_core/common/cbindgen_cython.toml

@@ -29,7 +29,7 @@ rename_variants = "ScreamingSnakeCase"
 
 [export.rename]
 "bool" = "bint"
-"SerializableUstr" = "char*"
+"Ustr" = "char*"
 "UnixNanos" = "uint64_t"
 "TimedeltaNanos" = "int64_t"
 "TimeEvent" = "TimeEvent_t"

nautilus_core/common/src/clock.rs

@@ -188,7 +188,7 @@ impl TestClock {
             .map(|event| {
                 let callback_py = self
                     .callbacks_py
-                    .get(event.name.0.as_str())
+                    .get(event.name.as_str())
                     .cloned()
                     .unwrap_or_else(|| {
                         // If callback_py is None, use the default_callback_py

nautilus_core/common/src/timer.rs

@@ -20,7 +20,6 @@ use std::{
 
 use nautilus_core::{
     correctness,
-    string::SerializableUstr,
     time::{TimedeltaNanos, UnixNanos},
     uuid::UUID4,
 };
@@ -33,7 +32,7 @@ use ustr::Ustr;
 /// Represents a time event occurring at the event timestamp.
 pub struct TimeEvent {
     /// The event name.
-    pub name: SerializableUstr,
+    pub name: Ustr,
     /// The event ID.
     pub event_id: UUID4,
     /// The message category
@@ -48,7 +47,7 @@ impl TimeEvent {
         correctness::valid_string(&name, "`TimeEvent` name");
 
         TimeEvent {
-            name: SerializableUstr(Ustr::from(&name)),
+            name: Ustr::from(&name),
             event_id,
             ts_event,
             ts_init,
@@ -151,7 +150,7 @@ impl TestTimer {
 
     pub fn pop_event(&self, event_id: UUID4, ts_init: UnixNanos) -> TimeEvent {
         TimeEvent {
-            name: SerializableUstr(Ustr::from(&self.name)),
+            name: Ustr::from(&self.name),
             event_id,
             ts_event: self.next_time_ns,
             ts_init,
@@ -182,7 +181,7 @@ impl Iterator for TestTimer {
         } else {
             let item = (
                 TimeEvent {
-                    name: SerializableUstr(Ustr::from(&self.name)),
+                    name: Ustr::from(&self.name),
                     event_id: UUID4::new(),
                     ts_event: self.next_time_ns,
                     ts_init: self.next_time_ns,

nautilus_core/core/cbindgen.toml

@@ -20,7 +20,6 @@ rename_variants = "ScreamingSnakeCase"
 [export.rename]
 "bool" = "uint8_t"
 "Ustr" = "char*"
-"SerializableUstr" = "char*"
 "UnixNanos" = "uint64_t"
 "TimedeltaNanos" = "int64_t"
 "TimeEvent" = "TimeEvent_t"

nautilus_core/core/cbindgen_cython.toml

@@ -29,7 +29,6 @@ rename_variants = "ScreamingSnakeCase"
 [export.rename]
 "bool" = "bint"
 "Ustr" = "char*"
-"SerializableUstr" = "char*"
 "UnixNanos" = "uint64_t"
 "TimedeltaNanos" = "int64_t"
 "TimeEvent" = "TimeEvent_t"

nautilus_core/core/src/string.rs

@@ -15,56 +15,12 @@
 
 use std::{
     ffi::{c_char, CStr, CString},
-    fmt, str,
+    str,
 };
 
 use pyo3::{ffi, types::PyString, FromPyPointer, Python};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use ustr::Ustr;
 
-#[repr(C)]
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub struct SerializableUstr(pub Ustr);
-
-impl Serialize for SerializableUstr {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = String::new();
-        fmt::write(&mut s, format_args!("{}", self.0)).map_err(serde::ser::Error::custom)?;
-        serializer.serialize_str(&s)
-    }
-}
-
-impl<'de> Deserialize<'de> for SerializableUstr {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        Ok(Self(Ustr::from(s.as_str())))
-    }
-}
-
-impl Default for SerializableUstr {
-    fn default() -> Self {
-        Self(Ustr::from(""))
-    }
-}
-
-impl fmt::Debug for SerializableUstr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", self.0)
-    }
-}
-
-impl fmt::Display for SerializableUstr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
 /// Returns an owned string from a valid Python object pointer.
 ///
 /// # Safety

nautilus_core/model/cbindgen.toml

@@ -17,7 +17,6 @@ exclude = [
 [export.rename]
 "bool" = "uint8_t"
 "Ustr" = "char*"
-"SerializableUstr" = "char*"
 "AccountId" = "AccountId_t"
 "Bar" = "Bar_t"
 "BarAggregation" = "uint8_t"

nautilus_core/model/cbindgen_cython.toml

@@ -33,7 +33,6 @@ exclude = [
 [export.rename]
 "bool" = "bint"
 "Ustr" = "char*"
-"SerializableUstr" = "char*"
 "AccountId" = "AccountId_t"
 "Bar" = "Bar_t"
 "BarAggregation" = "uint8_t"

nautilus_core/model/src/events/order.rs

@@ -16,8 +16,9 @@
 use std::collections::HashMap;
 
 use derive_builder::{self, Builder};
-use nautilus_core::{string::SerializableUstr, time::UnixNanos, uuid::UUID4};
+use nautilus_core::{time::UnixNanos, uuid::UUID4};
 use serde::{Deserialize, Serialize};
+use ustr::Ustr;
 
 use crate::{
     enums::{
@@ -141,7 +142,7 @@ pub struct OrderDenied {
     pub strategy_id: StrategyId,
     pub instrument_id: InstrumentId,
     pub client_order_id: ClientOrderId,
-    pub reason: SerializableUstr,
+    pub reason: Ustr,
     pub event_id: UUID4,
     pub ts_event: UnixNanos,
     pub ts_init: UnixNanos,
@@ -189,7 +190,7 @@ pub struct OrderRejected {
     pub instrument_id: InstrumentId,
     pub client_order_id: ClientOrderId,
     pub account_id: AccountId,
-    pub reason: SerializableUstr,
+    pub reason: Ustr,
     pub event_id: UUID4,
     pub ts_event: UnixNanos,
     pub ts_init: UnixNanos,
@@ -292,7 +293,7 @@ pub struct OrderModifyRejected {
     pub client_order_id: ClientOrderId,
     pub venue_order_id: Option<VenueOrderId>,
     pub account_id: Option<AccountId>,
-    pub reason: SerializableUstr,
+    pub reason: Ustr,
     pub event_id: UUID4,
     pub ts_event: UnixNanos,
     pub ts_init: UnixNanos,
@@ -310,7 +311,7 @@ pub struct OrderCancelRejected {
     pub client_order_id: ClientOrderId,
     pub venue_order_id: Option<VenueOrderId>,
     pub account_id: Option<AccountId>,
-    pub reason: SerializableUstr,
+    pub reason: Ustr,
     pub event_id: UUID4,
     pub ts_event: UnixNanos,
     pub ts_init: UnixNanos,

nautilus_core/model/src/events/order_api.rs

@@ -15,11 +15,7 @@
 
 use std::ffi::c_char;
 
-use nautilus_core::{
-    string::{cstr_to_ustr, SerializableUstr},
-    time::UnixNanos,
-    uuid::UUID4,
-};
+use nautilus_core::{string::cstr_to_ustr, time::UnixNanos, uuid::UUID4};
 
 // use crate::types::price::Price;
 // use crate::types::quantity::Quantity;
@@ -109,7 +105,7 @@ pub unsafe extern "C" fn order_denied_new(
         strategy_id,
         instrument_id,
         client_order_id,
-        reason: SerializableUstr(cstr_to_ustr(reason_ptr)),
+        reason: cstr_to_ustr(reason_ptr),
         event_id,
         ts_event,
         ts_init,
@@ -188,7 +184,7 @@ pub unsafe extern "C" fn order_rejected_new(
         instrument_id,
         client_order_id,
         account_id,
-        reason: SerializableUstr(cstr_to_ustr(reason_ptr)),
+        reason: cstr_to_ustr(reason_ptr),
         event_id,
         ts_event,
         ts_init,