Update UUID names

Author: stanislav-tkach

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

@@ -9,7 +9,7 @@ use cardano_blockchain_types::{MetadatumLabel, MultiEraBlock, TxnIndex};
 use catalyst_types::{
     hashes::{Blake2b256Hash, BLAKE_2B256_SIZE},
     problem_report::ProblemReport,
-    uuid::V4,
+    uuid::UuidV4,
 };
 use cbork_utils::decode_helper::{decode_bytes, decode_helper, decode_map_len};
 use minicbor::{
@@ -55,7 +55,7 @@ pub struct Cip509 {
     /// A registration purpose (`UUIDv4`).
     ///
     /// The purpose is defined by the consuming dApp.
-    purpose: Option<V4>,
+    purpose: Option<UuidV4>,
     /// Transaction inputs hash.
     txn_inputs_hash: Option<TxInputHash>,
     /// An optional hash of the previous transaction.
@@ -247,7 +247,7 @@ impl Cip509 {
     /// # Errors
     ///
     /// - `Err(ProblemReport)`
-    pub fn consume(self) -> Result<(V4, Cip509RbacMetadata, PaymentHistory), ProblemReport> {
+    pub fn consume(self) -> Result<(UuidV4, Cip509RbacMetadata, PaymentHistory), ProblemReport> {
         match (
             self.purpose,
             self.txn_inputs_hash,
@@ -436,7 +436,7 @@ fn payment_history(
 /// Decodes purpose.
 fn decode_purpose(
     d: &mut Decoder, context: &str, report: &ProblemReport,
-) -> Result<Option<V4>, ()> {
+) -> Result<Option<UuidV4>, ()> {
     let bytes = match decode_bytes(d, "Cip509 purpose") {
         Ok(v) => v,
         Err(e) => {
@@ -455,17 +455,12 @@ fn decode_purpose(
         );
         return Ok(None);
     };
-    let uuid = V4::from(uuid);
-    if uuid.is_valid() {
-        Ok(Some(uuid))
-    } else {
-        report.invalid_value(
-            "purpose",
-            &format!("{uuid:?}"),
-            "Invalid UUID version, UuidV4 expected",
-            context,
-        );
-        Ok(None)
+    match UuidV4::try_from(uuid) {
+        Ok(v) => Ok(Some(v)),
+        Err(e) => {
+            report.other(&format!("Invalid purpose UUID: {e:?}"), context);
+            Ok(None)
+        },
     }
 }
 

rust/rbac-registration/src/registration/cardano/mod.rs

@@ -4,7 +4,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use anyhow::bail;
 use c509_certificate::c509::C509;
-use catalyst_types::{hashes::Blake2b256Hash, uuid::V4};
+use catalyst_types::{hashes::Blake2b256Hash, uuid::UuidV4};
 use ed25519_dalek::VerifyingKey;
 use tracing::{error, warn};
 use x509_cert::certificate::Certificate as X509Certificate;
@@ -63,7 +63,7 @@ impl RegistrationChain {
 
     /// Get a list of purpose for this registration chain.
     #[must_use]
-    pub fn purpose(&self) -> &[V4] {
+    pub fn purpose(&self) -> &[UuidV4] {
         &self.inner.purpose
     }
 
@@ -110,7 +110,7 @@ struct RegistrationChainInner {
     /// The current transaction ID hash (32 bytes)
     current_tx_id_hash: Blake2b256Hash,
     /// List of purpose for this registration chain
-    purpose: Vec<V4>,
+    purpose: Vec<UuidV4>,
 
     // RBAC
     /// Map of index in array to point, transaction index, and x509 certificate.

rust/rbac-registration/src/utils/test.rs

@@ -3,7 +3,7 @@
 // cspell: words stake_test1urs8t0ssa3w9wh90ld5tprp3gurxd487rth2qlqk6ernjqcef4ugr
 
 use cardano_blockchain_types::{MultiEraBlock, Network, Point, Slot, TxnIndex};
-use catalyst_types::{hashes::Blake2b256Hash, uuid::V4};
+use catalyst_types::{hashes::Blake2b256Hash, uuid::UuidV4};
 use uuid::Uuid;
 
 use crate::cardano::cip509::{Cip509, RoleNumber};
@@ -24,7 +24,7 @@ pub struct BlockTestData {
     /// Previous hash.
     pub prv_hash: Option<Blake2b256Hash>,
     /// Purpose.
-    pub purpose: V4,
+    pub purpose: UuidV4,
     /// Stake address.
     pub stake_addr: Option<String>,
 }
@@ -71,7 +71,8 @@ pub fn block_1() -> BlockTestData {
         purpose: "ca7a1457-ef9f-4c7f-9c74-7f8c4a4cfa6c"
             .parse::<Uuid>()
             .unwrap()
-            .into(),
+            .try_into()
+            .unwrap(),
         stake_addr: Some(
             "stake_test1urs8t0ssa3w9wh90ld5tprp3gurxd487rth2qlqk6ernjqcef4ugr".to_string(),
         ),
@@ -107,7 +108,8 @@ pub fn block_2() -> BlockTestData {
         purpose: "ca7a1457-ef9f-4c7f-9c74-7f8c4a4cfa6c"
             .parse::<Uuid>()
             .unwrap()
-            .into(),
+            .try_into()
+            .unwrap(),
         stake_addr: None,
     }
 }
@@ -141,7 +143,8 @@ pub fn block_3() -> BlockTestData {
         purpose: "ca7a1457-ef9f-4c7f-9c74-7f8c4a4cfa6c"
             .parse::<Uuid>()
             .unwrap()
-            .into(),
+            .try_into()
+            .unwrap(),
         stake_addr: Some(
             "stake_test1urs8t0ssa3w9wh90ld5tprp3gurxd487rth2qlqk6ernjqcef4ugr"
                 .parse()
@@ -174,7 +177,8 @@ pub fn block_4() -> BlockTestData {
         purpose: "ca7a1457-ef9f-4c7f-9c74-7f8c4a4cfa6c"
             .parse::<Uuid>()
             .unwrap()
-            .into(),
+            .try_into()
+            .unwrap(),
         stake_addr: Some(
             "stake_test1urs8t0ssa3w9wh90ld5tprp3gurxd487rth2qlqk6ernjqcef4ugr".to_string(),
         ),