fix(rust/signed_doc): update code and examples with Uuid types

Author: saibatizoku

rust/signed_doc/examples/mk_signed_doc.rs

@@ -14,7 +14,7 @@ use ed25519_dalek::{
     ed25519::signature::Signer,
     pkcs8::{DecodePrivateKey, DecodePublicKey},
 };
-use signed_doc::{DocumentRef, Metadata};
+use signed_doc::{DocumentRef, Metadata, UuidV7};
 
 fn main() {
     if let Err(err) = Cli::parse().exec() {
@@ -83,24 +83,27 @@ fn decode_cbor_uuid(val: &coset::cbor::Value) -> anyhow::Result<uuid::Uuid> {
 
 fn encode_cbor_document_ref(doc_ref: &DocumentRef) -> coset::cbor::Value {
     match doc_ref {
-        DocumentRef::Latest { id } => encode_cbor_uuid(id),
+        DocumentRef::Latest { id } => encode_cbor_uuid(&id.uuid()),
         DocumentRef::WithVer(id, ver) => {
-            coset::cbor::Value::Array(vec![encode_cbor_uuid(id), encode_cbor_uuid(ver)])
+            coset::cbor::Value::Array(vec![
+                encode_cbor_uuid(&id.uuid()),
+                encode_cbor_uuid(&ver.uuid()),
+            ])
         },
     }
 }
 
 #[allow(clippy::indexing_slicing)]
 fn decode_cbor_document_ref(val: &coset::cbor::Value) -> anyhow::Result<DocumentRef> {
-    if let Ok(id) = decode_cbor_uuid(val) {
+    if let Ok(id) = UuidV7::try_from(val) {
         Ok(DocumentRef::Latest { id })
     } else {
         let Some(array) = val.as_array() else {
             anyhow::bail!("Invalid CBOR encoded document `ref` type");
         };
         anyhow::ensure!(array.len() == 2, "Invalid CBOR encoded document `ref` type");
-        let id = decode_cbor_uuid(&array[0])?;
-        let ver = decode_cbor_uuid(&array[1])?;
+        let id = UuidV7::try_from(&array[0])?;
+        let ver = UuidV7::try_from(&array[1])?;
         Ok(DocumentRef::WithVer(id, ver))
     }
 }

rust/signed_doc/src/metadata/document_ref.rs

@@ -1,4 +1,5 @@
 //! Catalyst Signed Document Metadata.
+use super::UuidV7;
 
 /// Reference to a Document.
 #[derive(Copy, Clone, Debug, serde::Deserialize)]
@@ -7,9 +8,9 @@ pub enum DocumentRef {
     /// Reference to the latest document
     Latest {
         /// Document ID UUID
-        id: uuid::Uuid,
+        id: UuidV7,
     },
     /// Reference to the specific document version
     /// Document ID UUID, Document Ver UUID
-    WithVer(uuid::Uuid, uuid::Uuid),
+    WithVer(UuidV7, UuidV7),
 }

rust/signed_doc/src/metadata/mod.rs

@@ -10,42 +10,39 @@ pub use uuid_type::{UuidV4, UuidV7};
 /// Document Metadata.
 #[derive(Debug, serde::Deserialize)]
 pub struct Metadata {
-    /// Document Type `UUIDv7`.
-    pub(crate) r#type: uuid::Uuid,
+    /// Document Type `UUIDv4`.
+    r#type: UuidV4,
     /// Document ID `UUIDv7`.
-    pub(crate) id: uuid::Uuid,
+    id: UuidV7,
     /// Document Version `UUIDv7`.
-    pub(crate) ver: uuid::Uuid,
+    ver: UuidV7,
     /// Reference to the latest document.
-    pub(crate) r#ref: Option<DocumentRef>,
+    r#ref: Option<DocumentRef>,
     /// Reference to the document template.
-    pub(crate) template: Option<DocumentRef>,
+    template: Option<DocumentRef>,
     /// Reference to the document reply.
-    pub(crate) reply: Option<DocumentRef>,
+    reply: Option<DocumentRef>,
     /// Reference to the document section.
-    pub(crate) section: Option<String>,
+    section: Option<String>,
 }
 
 impl Metadata {
-    /// Invalid Doc Type UUID
-    const INVALID_UUID: uuid::Uuid = uuid::Uuid::from_bytes([0x00; 16]);
-
     /// Return Document Type `UUIDv4`.
     #[must_use]
     pub fn doc_type(&self) -> uuid::Uuid {
-        self.r#type
+        self.r#type.uuid()
     }
 
     /// Return Document ID `UUIDv7`.
     #[must_use]
     pub fn doc_id(&self) -> uuid::Uuid {
-        self.id
+        self.id.uuid()
     }
 
     /// Return Document Version `UUIDv7`.
     #[must_use]
     pub fn doc_ver(&self) -> uuid::Uuid {
-        self.ver
+        self.ver.uuid()
     }
 
     /// Return Last Document Reference `Option<DocumentRef>`.
@@ -89,9 +86,9 @@ impl Display for Metadata {
 impl Default for Metadata {
     fn default() -> Self {
         Self {
-            r#type: Self::INVALID_UUID,
-            id: Self::INVALID_UUID,
-            ver: Self::INVALID_UUID,
+            r#type: UuidV4::invalid(),
+            id: UuidV7::invalid(),
+            ver: UuidV7::invalid(),
             r#ref: None,
             template: None,
             reply: None,