add utils mod

Author: Mr-Leshiy

rust/signed_doc/src/metadata/mod.rs

@@ -7,18 +7,20 @@ mod content_type;
 mod document_ref;
 mod extra_fields;
 mod section;
+pub(crate) mod utils;
 
 use algorithm::Algorithm;
 use catalyst_types::{
     problem_report::ProblemReport,
-    uuid::{CborContext, UuidV4, UuidV7},
+    uuid::{UuidV4, UuidV7},
 };
 pub use content_encoding::ContentEncoding;
 pub use content_type::ContentType;
-use coset::{iana::CoapContentFormat, CborSerializable};
+use coset::iana::CoapContentFormat;
 pub use document_ref::DocumentRef;
 pub use extra_fields::ExtraFields;
 pub use section::Section;
+use utils::{cose_protected_header_find, decode_cbor_uuid, encode_cbor_uuid};
 
 /// `content_encoding` field COSE key value
 const CONTENT_ENCODING_KEY: &str = "Content-Encoding";
@@ -298,43 +300,3 @@ impl TryFrom<&Metadata> for coset::Header {
         Ok(builder.build())
     }
 }
-
-/// Find a value for a predicate in the protected header.
-fn cose_protected_header_find(
-    protected: &coset::ProtectedHeader, mut predicate: impl FnMut(&coset::Label) -> bool,
-) -> Option<&coset::cbor::Value> {
-    protected
-        .header
-        .rest
-        .iter()
-        .find(|(key, _)| predicate(key))
-        .map(|(_, value)| value)
-}
-
-/// Encode `uuid::Uuid` type into `coset::cbor::Value`.
-///
-/// This is used to encode `UuidV4` and `UuidV7` types.
-pub(crate) fn encode_cbor_uuid<T: minicbor::encode::Encode<CborContext>>(
-    value: T,
-) -> anyhow::Result<coset::cbor::Value> {
-    let mut cbor_bytes = Vec::new();
-    minicbor::encode_with(value, &mut cbor_bytes, &mut CborContext::Tagged)
-        .map_err(|e| anyhow::anyhow!("Unable to encode CBOR value, err: {e}"))?;
-    coset::cbor::Value::from_slice(&cbor_bytes)
-        .map_err(|e| anyhow::anyhow!("Invalid CBOR value, err: {e}"))
-}
-
-/// Decode `From<uuid::Uuid>` type from `coset::cbor::Value`.
-///
-/// This is used to decode `UuidV4` and `UuidV7` types.
-pub(crate) fn decode_cbor_uuid<T: for<'a> minicbor::decode::Decode<'a, CborContext>>(
-    value: coset::cbor::Value,
-) -> anyhow::Result<T> {
-    match value.to_vec() {
-        Ok(cbor_value) => {
-            minicbor::decode_with(&cbor_value, &mut CborContext::Tagged)
-                .map_err(|e| anyhow::anyhow!("Invalid UUID, err: {e}"))
-        },
-        Err(e) => anyhow::bail!("Invalid CBOR value, err: {e}"),
-    }
-}

rust/signed_doc/src/metadata/utils.rs

@@ -0,0 +1,44 @@
+//! Utitlity functions for metadata decoding fields
+
+use catalyst_types::uuid::CborContext;
+use coset::CborSerializable;
+
+/// Find a value for a predicate in the protected header.
+pub(crate) fn cose_protected_header_find(
+    protected: &coset::ProtectedHeader, mut predicate: impl FnMut(&coset::Label) -> bool,
+) -> Option<&coset::cbor::Value> {
+    protected
+        .header
+        .rest
+        .iter()
+        .find(|(key, _)| predicate(key))
+        .map(|(_, value)| value)
+}
+
+/// Encode `uuid::Uuid` type into `coset::cbor::Value`.
+///
+/// This is used to encode `UuidV4` and `UuidV7` types.
+pub(crate) fn encode_cbor_uuid<T: minicbor::encode::Encode<CborContext>>(
+    value: T,
+) -> anyhow::Result<coset::cbor::Value> {
+    let mut cbor_bytes = Vec::new();
+    minicbor::encode_with(value, &mut cbor_bytes, &mut CborContext::Tagged)
+        .map_err(|e| anyhow::anyhow!("Unable to encode CBOR value, err: {e}"))?;
+    coset::cbor::Value::from_slice(&cbor_bytes)
+        .map_err(|e| anyhow::anyhow!("Invalid CBOR value, err: {e}"))
+}
+
+/// Decode `From<uuid::Uuid>` type from `coset::cbor::Value`.
+///
+/// This is used to decode `UuidV4` and `UuidV7` types.
+pub(crate) fn decode_cbor_uuid<T: for<'a> minicbor::decode::Decode<'a, CborContext>>(
+    value: coset::cbor::Value,
+) -> anyhow::Result<T> {
+    match value.to_vec() {
+        Ok(cbor_value) => {
+            minicbor::decode_with(&cbor_value, &mut CborContext::Tagged)
+                .map_err(|e| anyhow::anyhow!("Invalid UUID, err: {e}"))
+        },
+        Err(e) => anyhow::bail!("Invalid CBOR value, err: {e}"),
+    }
+}

rust/signed_doc/src/validator/rules/reply.rs

@@ -50,7 +50,6 @@ where Provider: 'static + CatalystSignedDocumentProvider
                             return Ok(false);
                         }
                     }
-        
                     Ok(true)
                 };
                 return validate_provided_doc(&reply, provider, doc.report(), reply_validator).await;