update CatalystSignedDocument decoding

Author: Mr-Leshiy

rust/signed_doc/src/lib.rs

@@ -48,13 +48,59 @@ impl Display for CatalystSignedDocument {
     }
 }
 
-impl TryFrom<&[u8]> for CatalystSignedDocument {
-    type Error = error::Error;
+impl CatalystSignedDocument {
+    // A bunch of getters to access the contents, or reason through the document, such as.
+
+    /// Return Document Type `UUIDv4`.
+    #[must_use]
+    pub fn doc_type(&self) -> uuid::Uuid {
+        self.inner.metadata.doc_type()
+    }
+
+    /// Return Document ID `UUIDv7`.
+    #[must_use]
+    pub fn doc_id(&self) -> uuid::Uuid {
+        self.inner.metadata.doc_id()
+    }
+
+    /// Return Document Version `UUIDv7`.
+    #[must_use]
+    pub fn doc_ver(&self) -> uuid::Uuid {
+        self.inner.metadata.doc_ver()
+    }
+
+    /// Return document `Content`.
+    #[must_use]
+    pub fn doc_content(&self) -> &Content {
+        &self.inner.content
+    }
+
+    /// Return document metadata content.
+    #[must_use]
+    pub fn doc_meta(&self) -> &AdditionalFields {
+        self.inner.metadata.extra()
+    }
+
+    /// Return a Document's signatures
+    #[must_use]
+    pub fn signatures(&self) -> &Signatures {
+        &self.inner.signatures
+    }
+}
+
+impl minicbor::Decode<'_, ()> for CatalystSignedDocument {
+    fn decode(d: &mut minicbor::Decoder<'_>, (): &mut ()) -> Result<Self, minicbor::decode::Error> {
+        let start = d.position();
+        d.skip()?;
+        let end = d.position();
+        let cose_bytes = d
+            .input()
+            .get(start..end)
+            .ok_or(minicbor::decode::Error::end_of_input())?;
 
-    fn try_from(cose_bytes: &[u8]) -> Result<Self, Self::Error> {
-        // Try reading as a tagged COSE SIGN, otherwise try reading as untagged.
-        let cose_sign = coset::CoseSign::from_slice(cose_bytes)
-            .map_err(|e| vec![anyhow::anyhow!("Invalid COSE Sign document: {e}")])?;
+        let cose_sign = coset::CoseSign::from_slice(cose_bytes).map_err(|e| {
+            minicbor::decode::Error::message(format!("Invalid COSE Sign document: {e}"))
+        })?;
 
         let mut errors = Vec::new();
 
@@ -86,7 +132,7 @@ impl TryFrom<&[u8]> for CatalystSignedDocument {
                 )
                 .map_err(|e| {
                     errors.push(anyhow!("Invalid Document Content: {e}"));
-                    errors
+                    minicbor::decode::Error::custom(error::Error(errors))
                 })?;
 
                 Ok(CatalystSignedDocument {
@@ -98,47 +144,7 @@ impl TryFrom<&[u8]> for CatalystSignedDocument {
                     .into(),
                 })
             },
-            _ => Err(error::Error(errors)),
+            _ => Err(minicbor::decode::Error::custom(error::Error(errors))),
         }
     }
 }
-
-impl CatalystSignedDocument {
-    // A bunch of getters to access the contents, or reason through the document, such as.
-
-    /// Return Document Type `UUIDv4`.
-    #[must_use]
-    pub fn doc_type(&self) -> uuid::Uuid {
-        self.inner.metadata.doc_type()
-    }
-
-    /// Return Document ID `UUIDv7`.
-    #[must_use]
-    pub fn doc_id(&self) -> uuid::Uuid {
-        self.inner.metadata.doc_id()
-    }
-
-    /// Return Document Version `UUIDv7`.
-    #[must_use]
-    pub fn doc_ver(&self) -> uuid::Uuid {
-        self.inner.metadata.doc_ver()
-    }
-
-    /// Return document `Content`.
-    #[must_use]
-    pub fn doc_content(&self) -> &Content {
-        &self.inner.content
-    }
-
-    /// Return document metadata content.
-    #[must_use]
-    pub fn doc_meta(&self) -> &AdditionalFields {
-        self.inner.metadata.extra()
-    }
-
-    /// Return a Document's signatures
-    #[must_use]
-    pub fn signatures(&self) -> &Signatures {
-        &self.inner.signatures
-    }
-}