fix(signed-doc): remove problem report in encoder

Signed-off-by: bkioshn <bkioshn@gmail.com>

Author: bkioshn

rust/signed_doc/src/metadata/document_refs/doc_locator.rs

@@ -114,32 +114,14 @@ impl Decode<'_, ProblemReport> for DocLocator {
     }
 }
 
-impl Encode<ProblemReport> for DocLocator {
+impl Encode<()> for DocLocator {
     fn encode<W: minicbor::encode::Write>(
-        &self, e: &mut minicbor::Encoder<W>, report: &mut ProblemReport,
+        &self, e: &mut minicbor::Encoder<W>, _: &mut (),
     ) -> Result<(), minicbor::encode::Error<W::Error>> {
-        const CONTEXT: &str = "DocLocator encoding";
-        e.map(DOC_LOC_MAP_ITEM).map_err(|_| {
-            report.invalid_encoding(
-                "Map",
-                "Invalid length",
-                &DOC_LOC_MAP_ITEM.to_string(),
-                CONTEXT,
-            );
-            minicbor::encode::Error::message(format!("{CONTEXT}: Unable to encode map length"))
-        })?;
-        e.str(CID_MAP_KEY).map_err(|_| {
-            report.invalid_encoding("Key", "Invalid string", " String", CONTEXT);
-            minicbor::encode::Error::message(format!("{CONTEXT}: Unable to encode key"))
-        })?;
-        e.tag(minicbor::data::Tag::new(CID_TAG)).map_err(|_| {
-            report.invalid_encoding("CBOR tag", "Invalid tag", &CID_TAG.to_string(), CONTEXT);
-            minicbor::encode::Error::message(format!("{CONTEXT}: Unable to encode CBOR tag"))
-        })?;
-        e.bytes(&self.0).map_err(|_| {
-            report.invalid_encoding("CID", "Invalid bytes", "Valid CBOR byte", CONTEXT);
-            minicbor::encode::Error::message(format!("{CONTEXT}: Unable to encode CID bytes"))
-        })?;
+        e.map(DOC_LOC_MAP_ITEM)?;
+        e.str(CID_MAP_KEY)?;
+        e.tag(minicbor::data::Tag::new(CID_TAG))?;
+        e.bytes(&self.0)?;
         Ok(())
     }
 }
@@ -157,7 +139,7 @@ mod tests {
         let locator = DocLocator(vec![1, 2, 3, 4]);
         let mut buffer = Vec::new();
         let mut encoder = Encoder::new(&mut buffer);
-        locator.encode(&mut encoder, &mut report).unwrap();
+        locator.encode(&mut encoder, &mut ()).unwrap();
         let mut decoder = Decoder::new(&buffer);
         let decoded_doc_loc = DocLocator::decode(&mut decoder, &mut report).unwrap();
         assert_eq!(locator, decoded_doc_loc);
@@ -170,7 +152,7 @@ mod tests {
         let locator = DocLocator(vec![]);
         let mut buffer = Vec::new();
         let mut encoder = Encoder::new(&mut buffer);
-        locator.encode(&mut encoder, &mut report).unwrap();
+        locator.encode(&mut encoder, &mut ()).unwrap();
         let mut decoder = Decoder::new(&buffer);
         let decoded_doc_loc = DocLocator::decode(&mut decoder, &mut report).unwrap();
         assert_eq!(locator, decoded_doc_loc);

rust/signed_doc/src/metadata/document_refs/doc_ref.rs

@@ -2,10 +2,7 @@
 
 use std::fmt::Display;
 
-use catalyst_types::{
-    problem_report::ProblemReport,
-    uuid::{CborContext, UuidV7},
-};
+use catalyst_types::uuid::{CborContext, UuidV7};
 use coset::cbor::Value;
 use minicbor::{Decode, Decoder, Encode};
 
@@ -135,29 +132,14 @@ impl Decode<'_, DecodeContext<'_>> for DocumentRef {
     }
 }
 
-impl Encode<ProblemReport> for DocumentRef {
+impl Encode<()> for DocumentRef {
     fn encode<W: minicbor::encode::Write>(
-        &self, e: &mut minicbor::Encoder<W>, report: &mut ProblemReport,
+        &self, e: &mut minicbor::Encoder<W>, ctx: &mut (),
     ) -> Result<(), minicbor::encode::Error<W::Error>> {
-        const CONTEXT: &str = "DocumentRef encoding";
         e.array(DOC_REF_ARR_ITEM)?;
-        self.id.encode(e, &mut CborContext::Tagged).map_err(|_| {
-            report.invalid_encoding("ID", &self.id.to_string(), "Valid UUIDv7", CONTEXT);
-            minicbor::encode::Error::message(format!("{CONTEXT}: ID UUIDv7 encoding failed"))
-        })?;
-        self.ver.encode(e, &mut CborContext::Tagged).map_err(|_| {
-            report.invalid_encoding("Ver", &self.id.to_string(), "Valid UUIDv7", CONTEXT);
-            minicbor::encode::Error::message(format!("{CONTEXT}: Ver UUIDv7 encoding failed"))
-        })?;
-        self.doc_locator.encode(e, report).map_err(|e| {
-            report.invalid_encoding(
-                "Doc locator",
-                &self.doc_locator.to_string(),
-                "Valid doc locator",
-                CONTEXT,
-            );
-            e.with_message("{CONTEXT}: Failed to encode doc locator")
-        })?;
+        self.id.encode(e, &mut CborContext::Tagged)?;
+        self.ver.encode(e, &mut CborContext::Tagged)?;
+        self.doc_locator.encode(e, ctx)?;
         Ok(())
     }
 }

rust/signed_doc/src/metadata/document_refs/mod.rs

@@ -147,29 +147,25 @@ impl Decode<'_, DecodeContext<'_>> for DocumentRefs {
     }
 }
 
-impl Encode<ProblemReport> for DocumentRefs {
+impl Encode<()> for DocumentRefs {
     fn encode<W: minicbor::encode::Write>(
-        &self, e: &mut minicbor::Encoder<W>, report: &mut ProblemReport,
+        &self, e: &mut minicbor::Encoder<W>, ctx: &mut (),
     ) -> Result<(), minicbor::encode::Error<W::Error>> {
         const CONTEXT: &str = "DocumentRefs encoding";
         if self.0.is_empty() {
-            report.invalid_value(
-                "DocumentRefs",
-                "empty",
-                "DocumentRefs cannot be empty",
-                CONTEXT,
-            );
             return Err(minicbor::encode::Error::message(format!(
                 "{CONTEXT}: DocumentRefs cannot be empty"
             )));
         }
-        e.array(self.0.len().try_into().map_err(|_| {
-            report.invalid_encoding("Array", "Invalid array", "Valid array", CONTEXT);
-            minicbor::encode::Error::message(format!("{CONTEXT}, unable to encode array length"))
-        })?)?;
+        e.array(
+            self.0
+                .len()
+                .try_into()
+                .map_err(|e| minicbor::encode::Error::message(format!("{CONTEXT}, {e}")))?,
+        )?;
 
         for doc_ref in &self.0 {
-            doc_ref.encode(e, report)?;
+            doc_ref.encode(e, ctx)?;
         }
         Ok(())
     }