fix(rust/catalyst-types): add serde::Serialize to UUID types (#147)

input-output-hk · Jan 11, 2025 · 3b4c144 · 3b4c144
1 parent cb475a6
commit 3b4c144
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/rust/catalyst-types/src/uuid/uuid_v4.rs b/rust/catalyst-types/src/uuid/uuid_v4.rs
@@ -4,8 +4,9 @@ use std::fmt::{Display, Formatter};
 use super::{decode_cbor_uuid, INVALID_UUID};
 
 /// Type representing a `UUIDv4`.
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, serde::Deserialize)]
+#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, serde::Serialize, serde::Deserialize)]
 #[serde(from = "uuid::Uuid")]
+#[serde(into = "uuid::Uuid")]
 pub struct UuidV4 {
     /// UUID
     uuid: uuid::Uuid,
@@ -69,6 +70,15 @@ impl From<uuid::Uuid> for UuidV4 {
     }
 }
 
+/// Returns a `uuid::Uuid` from `UUIDv4`.
+///
+/// NOTE: This does not guarantee that the `UUID` is valid.
+impl From<UuidV4> for uuid::Uuid {
+    fn from(value: UuidV4) -> Self {
+        value.uuid
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use coset::cbor::Value;

diff --git a/rust/catalyst-types/src/uuid/uuid_v7.rs b/rust/catalyst-types/src/uuid/uuid_v7.rs
@@ -4,8 +4,9 @@ use std::fmt::{Display, Formatter};
 use super::{decode_cbor_uuid, INVALID_UUID};
 
 /// Type representing a `UUIDv7`.
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, serde::Deserialize)]
+#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, serde::Serialize, serde::Deserialize)]
 #[serde(from = "uuid::Uuid")]
+#[serde(into = "uuid::Uuid")]
 pub struct UuidV7 {
     /// UUID
     uuid: uuid::Uuid,
@@ -69,6 +70,15 @@ impl From<uuid::Uuid> for UuidV7 {
     }
 }
 
+/// Returns a `uuid::Uuid` from `UUIDv7`.
+///
+/// NOTE: This does not guarantee that the `UUID` is valid.
+impl From<UuidV7> for uuid::Uuid {
+    fn from(value: UuidV7) -> Self {
+        value.uuid
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use coset::cbor::Value;