wip

Author: Mr-Leshiy

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

@@ -22,7 +22,6 @@ use catalyst_types::{
     uuid::UuidV4,
 };
 use cbork_utils::decode_helper::{decode_bytes, decode_helper, decode_map_len};
-use ed25519_dalek::VerifyingKey;
 use minicbor::{
     decode::{self},
     Decode, Decoder,
@@ -33,7 +32,6 @@ use uuid::Uuid;
 
 use crate::cardano::cip509::{
     decode_context::DecodeContext,
-    extract_key,
     rbac::Cip509RbacMetadata,
     types::{PaymentHistory, TxInputHash, ValidationSignature},
     utils::Cip0134UriSet,
@@ -42,7 +40,7 @@ use crate::cardano::cip509::{
         validate_txn_inputs_hash,
     },
     x509_chunks::X509Chunks,
-    C509Cert, LocalRefInt, Payment, PointTxnIdx, RoleData, SimplePublicKeyType, X509DerCert,
+    Payment, PointTxnIdx, RoleData,
 };
 
 /// A x509 metadata envelope.
@@ -229,46 +227,6 @@ impl Cip509 {
         self.metadata.as_ref().and_then(|m| m.role_data.get(&role))
     }
 
-    /// Returns signing public key for a role.
-    #[must_use]
-    pub fn signing_pk_for_role(
-        &self,
-        role: RoleId,
-    ) -> Option<VerifyingKey> {
-        self.metadata.as_ref().and_then(|m| {
-            let key_ref = m.role_data.get(&role).and_then(|d| d.signing_key())?;
-            match key_ref.local_ref {
-                LocalRefInt::X509Certs => {
-                    m.x509_certs.get(key_ref.key_offset).and_then(|c| {
-                        if let X509DerCert::X509Cert(c) = c {
-                            extract_key::x509_key(&c).ok()
-                        } else {
-                            None
-                        }
-                    })
-                },
-                LocalRefInt::C509Certs => {
-                    m.c509_certs.get(key_ref.key_offset).and_then(|c| {
-                        if let C509Cert::C509Certificate(c) = c {
-                            extract_key::c509_key(&c).ok()
-                        } else {
-                            None
-                        }
-                    })
-                },
-                LocalRefInt::PubKeys => {
-                    m.pub_keys.get(key_ref.key_offset).and_then(|c| {
-                        if let SimplePublicKeyType::Ed25519(c) = c {
-                            Some(c.clone())
-                        } else {
-                            None
-                        }
-                    })
-                },
-            }
-        })
-    }
-
     /// Returns a purpose of this registration.
     #[must_use]
     pub fn purpose(&self) -> Option<UuidV4> {
@@ -355,26 +313,10 @@ impl Cip509 {
             .unwrap_or_default()
     }
 
-    /// Returns `Cip509` fields consuming the structure if it was successfully decoded and
-    /// validated otherwise return the problem report that contains all the encountered
-    /// issues.
-    ///
-    /// # Errors
-    ///
-    /// - `Err(ProblemReport)`
-    pub fn consume(self) -> Result<(UuidV4, Cip509RbacMetadata, PaymentHistory), ProblemReport> {
-        match (
-            self.purpose,
-            self.txn_inputs_hash,
-            self.metadata,
-            self.validation_signature,
-        ) {
-            (Some(purpose), Some(_), Some(metadata), Some(_)) if !self.report.is_problematic() => {
-                Ok((purpose, metadata, self.payment_history))
-            },
-
-            _ => Err(self.report),
-        }
+    /// Returns a payment history map.
+    #[must_use]
+    pub fn payment_history(&self) -> &PaymentHistory {
+        &self.payment_history
     }
 }
 

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

@@ -593,8 +593,7 @@ mod tests {
         assert_eq!(origin.txn_index(), data.txn_index);
         assert_eq!(origin.point().slot_or_default(), data.slot);
 
-        // The consume function must return the problem report contained within the registration.
-        let report = registration.consume().unwrap_err();
+        let report = registration.report();
         assert!(report.is_problematic());
         let report = format!("{report:?}");
         assert!(report.contains("is not present in the transaction witness set, and can not be verified as owned and spendable"));
@@ -616,7 +615,7 @@ mod tests {
         assert_eq!(origin.txn_index(), data.txn_index);
         assert_eq!(origin.point().slot_or_default(), data.slot);
 
-        let report = registration.consume().unwrap_err();
+        let report = registration.report();
         assert!(report.is_problematic());
         let report = format!("{report:?}");
         assert!(report
@@ -637,8 +636,7 @@ mod tests {
         assert_eq!(origin.txn_index(), data.txn_index);
         assert_eq!(origin.point().slot_or_default(), data.slot);
 
-        // The consume function must return the problem report contained within the registration.
-        let report = registration.consume().unwrap_err();
+        let report = registration.report();
         assert!(report.is_problematic());
         let report = format!("{report:?}");
         assert!(report.contains("Unknown role found: 4"));