More error handling

Author: stanislav-tkach

rust/rbac-registration/src/cardano/cip509/rbac/role_data.rs

@@ -77,8 +77,7 @@ impl Decode<'_, ProblemReport> for CborRoleData {
                         data.encryption_key = decode_encryption_key(d, context, report);
                     },
                     RoleDataInt::PaymentKey => {
-                        data.payment_key =
-                            Some(decode_helper(d, "PaymentKey in RoleData", &mut ())?);
+                        data.payment_key = decode_payment_key(d, context, report);
                     },
                 }
             } else {
@@ -166,3 +165,17 @@ fn decode_encryption_key(
         },
     }
 }
+
+/// Decodes a payment key.
+fn decode_payment_key(d: &mut Decoder, context: &str, report: &ProblemReport) -> Option<u16> {
+    match decode_helper(d, "PaymentKey in RoleData", &mut ()) {
+        Ok(v) => Some(v),
+        Err(e) => {
+            report.other(
+                &format!("Unable to decode role payment key: {e:?}"),
+                context,
+            );
+            None
+        },
+    }
+}

rust/rbac-registration/src/cardano/cip509/x509_chunks.rs

@@ -68,9 +68,16 @@ impl Decode<'_, DecodeContext<'_, '_>> for X509Chunks {
 
         // Decode the decompressed data.
         let mut decoder = Decoder::new(&decompressed);
-        let chunk_data = Cip509RbacMetadata::decode(&mut decoder, decode_context).map_err(|e| {
-            decode::Error::message(format!("Failed to decode Cip509 metadata: {e:?}"))
-        })?;
+        let chunk_data = match Cip509RbacMetadata::decode(&mut decoder, decode_context) {
+            Ok(d) => d,
+            Err(e) => {
+                decode_context.report.other(
+                    &format!("Failed to decode: {e:?}"),
+                    "Cip509 chunked metadata",
+                );
+                return Ok(Self(None));
+            },
+        };
 
         Ok(X509Chunks(Some(chunk_data)))
     }