Revert UUID changes (temporary)

Author: stanislav-tkach

rust/catalyst-types/src/uuid/mod.rs

@@ -4,8 +4,8 @@ mod uuid_v4;
 mod uuid_v7;
 
 use minicbor::data::Tag;
-pub use uuid_v4::UuidV4;
-pub use uuid_v7::UuidV7;
+pub use uuid_v4::UuidV4 as V4;
+pub use uuid_v7::UuidV7 as V7;
 
 /// Invalid Doc Type UUID
 pub const INVALID_UUID: uuid::Uuid = uuid::Uuid::from_bytes([0x00; 16]);
@@ -77,12 +77,12 @@ fn encode_cbor_uuid<W: minicbor::encode::Write>(
 #[cfg(test)]
 mod tests {
 
-    use super::{UuidV4, UuidV7};
+    use super::{V4, V7};
     use crate::uuid::CborContext;
 
     #[test]
     fn test_cbor_uuid_v4_roundtrip() {
-        let uuid: UuidV4 = uuid::Uuid::new_v4().into();
+        let uuid: V4 = uuid::Uuid::new_v4().into();
         let mut bytes = Vec::new();
         minicbor::encode_with(uuid, &mut bytes, &mut CborContext::Untagged).unwrap();
         let decoded = minicbor::decode_with(bytes.as_slice(), &mut CborContext::Untagged).unwrap();
@@ -91,7 +91,7 @@ mod tests {
 
     #[test]
     fn test_cbor_uuid_v7_roundtrip() {
-        let uuid: UuidV7 = uuid::Uuid::now_v7().into();
+        let uuid: V7 = uuid::Uuid::now_v7().into();
         let mut bytes = Vec::new();
         minicbor::encode_with(uuid, &mut bytes, &mut CborContext::Untagged).unwrap();
         let decoded = minicbor::decode_with(bytes.as_slice(), &mut CborContext::Untagged).unwrap();
@@ -100,7 +100,7 @@ mod tests {
 
     #[test]
     fn test_tagged_cbor_uuid_v4_roundtrip() {
-        let uuid: UuidV4 = uuid::Uuid::new_v4().into();
+        let uuid: V4 = uuid::Uuid::new_v4().into();
         let mut bytes = Vec::new();
         minicbor::encode_with(uuid, &mut bytes, &mut CborContext::Tagged).unwrap();
         let decoded = minicbor::decode_with(bytes.as_slice(), &mut CborContext::Tagged).unwrap();
@@ -109,7 +109,7 @@ mod tests {
 
     #[test]
     fn test_tagged_cbor_uuid_v7_roundtrip() {
-        let uuid: UuidV7 = uuid::Uuid::now_v7().into();
+        let uuid: V7 = uuid::Uuid::now_v7().into();
         let mut bytes = Vec::new();
         minicbor::encode_with(uuid, &mut bytes, &mut CborContext::Tagged).unwrap();
         let decoded = minicbor::decode_with(bytes.as_slice(), &mut CborContext::Tagged).unwrap();
@@ -118,7 +118,7 @@ mod tests {
 
     #[test]
     fn test_optional_cbor_uuid_v4_roundtrip() {
-        let uuid: UuidV4 = uuid::Uuid::new_v4().into();
+        let uuid: V4 = uuid::Uuid::new_v4().into();
 
         let mut bytes = Vec::new();
         minicbor::encode_with(uuid, &mut bytes, &mut CborContext::Untagged).unwrap();
@@ -133,7 +133,7 @@ mod tests {
 
     #[test]
     fn test_optional_cbor_uuid_v7_roundtrip() {
-        let uuid: UuidV7 = uuid::Uuid::now_v7().into();
+        let uuid: V7 = uuid::Uuid::now_v7().into();
 
         let mut bytes = Vec::new();
         minicbor::encode_with(uuid, &mut bytes, &mut CborContext::Untagged).unwrap();

rust/catalyst-types/tests/mod.rs

@@ -9,8 +9,8 @@ fn test_type_usage() {
     type B = catalyst_types::hashes::Blake2b224Hash;
     type C = catalyst_types::hashes::Blake2b256Hash;
 
-    type D = catalyst_types::uuid::UuidV4;
-    type E = catalyst_types::uuid::UuidV7;
+    type D = catalyst_types::uuid::V4;
+    type E = catalyst_types::uuid::V7;
 
     type F = catalyst_types::kid_uri::KidUri;
 

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::UuidV4,
+    uuid::V4,
 };
 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<UuidV4>,
+    purpose: Option<V4>,
     /// 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<(UuidV4, Cip509RbacMetadata, PaymentHistory), ProblemReport> {
+    pub fn consume(self) -> Result<(V4, 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<UuidV4>, ()> {
+) -> Result<Option<V4>, ()> {
     let bytes = match decode_bytes(d, "Cip509 purpose") {
         Ok(v) => v,
         Err(e) => {
@@ -455,7 +455,7 @@ fn decode_purpose(
         );
         return Ok(None);
     };
-    let uuid = UuidV4::from(uuid);
+    let uuid = V4::from(uuid);
     if uuid.is_valid() {
         Ok(Some(uuid))
     } else {

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::UuidV4};
+use catalyst_types::{hashes::Blake2b256Hash, uuid::V4};
 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) -> &[UuidV4] {
+    pub fn purpose(&self) -> &[V4] {
         &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<UuidV4>,
+    purpose: Vec<V4>,
 
     // 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::UuidV4};
+use catalyst_types::{hashes::Blake2b256Hash, uuid::V4};
 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: UuidV4,
+    pub purpose: V4,
     /// Stake address.
     pub stake_addr: Option<String>,
 }