From 310e6bc5bce3684c2aadcf320ddd7627bf6332e8 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 20 Nov 2025 17:12:33 +0700 Subject: [PATCH] wip --- rust/rbac-registration/src/cardano/cip509/cip509.rs | 2 +- rust/rbac-registration/src/cardano/cip509/mod.rs | 2 +- .../src/cardano/cip509/utils/cip134_uri_set.rs | 10 +++++----- rust/rbac-registration/src/cardano/cip509/utils/mod.rs | 2 +- rust/rbac-registration/src/registration/cardano/mod.rs | 6 ++++++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/rust/rbac-registration/src/cardano/cip509/cip509.rs b/rust/rbac-registration/src/cardano/cip509/cip509.rs index c99a94de95a..592e558672c 100644 --- a/rust/rbac-registration/src/cardano/cip509/cip509.rs +++ b/rust/rbac-registration/src/cardano/cip509/cip509.rs @@ -310,7 +310,7 @@ impl Cip509 { /// Returns URIs contained in both x509 and c509 certificates of `Cip509` metadata. #[must_use] - pub(crate) fn certificate_uris(&self) -> Option<&Cip0134UriSet> { + pub fn certificate_uris(&self) -> Option<&Cip0134UriSet> { self.metadata.as_ref().map(|m| &m.certificate_uris) } diff --git a/rust/rbac-registration/src/cardano/cip509/mod.rs b/rust/rbac-registration/src/cardano/cip509/mod.rs index d4f009769e2..caaa74c6532 100644 --- a/rust/rbac-registration/src/cardano/cip509/mod.rs +++ b/rust/rbac-registration/src/cardano/cip509/mod.rs @@ -9,7 +9,7 @@ pub use types::{ CertKeyHash, CertOrPk, KeyLocalRef, LocalRefInt, Payment, PaymentHistory, PointData, PointTxnIdx, RoleData, RoleDataRecord, TxInputHash, ValidationSignature, }; -pub(crate) use utils::{Cip0134UriSet, extract_key}; +pub use utils::{Cip0134UriSet, extract_key}; #[allow(clippy::module_inception)] mod cip509; diff --git a/rust/rbac-registration/src/cardano/cip509/utils/cip134_uri_set.rs b/rust/rbac-registration/src/cardano/cip509/utils/cip134_uri_set.rs index d8a13c2c247..8868ea9a530 100644 --- a/rust/rbac-registration/src/cardano/cip509/utils/cip134_uri_set.rs +++ b/rust/rbac-registration/src/cardano/cip509/utils/cip134_uri_set.rs @@ -30,7 +30,7 @@ type UrisMap = HashMap>; /// This structure uses [`Arc`] internally, so it is cheap to clone. #[derive(Debug, Clone, Eq, PartialEq)] #[allow(clippy::module_name_repetitions)] -pub(crate) struct Cip0134UriSet(Arc); +pub struct Cip0134UriSet(Arc); /// Internal `Cip0134UriSet` data. #[derive(Debug, Clone, Eq, PartialEq)] @@ -74,7 +74,7 @@ impl Cip0134UriSet { } /// Returns an iterator over of `Cip0134Uri`. - pub(crate) fn values(&self) -> impl Iterator { + pub fn values(&self) -> impl Iterator { self.x_uris() .values() .chain(self.c_uris().values()) @@ -82,8 +82,8 @@ impl Cip0134UriSet { } /// Returns `true` if both x509 and c509 certificate maps are empty. - #[cfg(test)] - pub(crate) fn is_empty(&self) -> bool { + #[must_use] + pub fn is_empty(&self) -> bool { self.x_uris().is_empty() && self.c_uris().is_empty() } @@ -124,7 +124,7 @@ impl Cip0134UriSet { /// Returns a set of all active (without taken) stake addresses. #[must_use] - pub(crate) fn stake_addresses(&self) -> HashSet { + pub fn stake_addresses(&self) -> HashSet { self.values() .filter_map(|uri| { match uri.address() { diff --git a/rust/rbac-registration/src/cardano/cip509/utils/mod.rs b/rust/rbac-registration/src/cardano/cip509/utils/mod.rs index b1dfcce9849..0584cc801c5 100644 --- a/rust/rbac-registration/src/cardano/cip509/utils/mod.rs +++ b/rust/rbac-registration/src/cardano/cip509/utils/mod.rs @@ -2,6 +2,6 @@ pub mod cip19; pub mod extract_key; -pub(crate) use cip134_uri_set::Cip0134UriSet; +pub use cip134_uri_set::Cip0134UriSet; mod cip134_uri_set; diff --git a/rust/rbac-registration/src/registration/cardano/mod.rs b/rust/rbac-registration/src/registration/cardano/mod.rs index cdbc547860a..ead266c971c 100644 --- a/rust/rbac-registration/src/registration/cardano/mod.rs +++ b/rust/rbac-registration/src/registration/cardano/mod.rs @@ -320,6 +320,12 @@ impl RegistrationChain { .and_then(|rdr| rdr.encryption_key_from_rotation(rotation)) } + /// Returns most recent URIs contained from both x509 and c509 certificates. + #[must_use] + pub fn certificate_uris(&self) -> &Cip0134UriSet { + &self.inner.certificate_uris + } + /// Returns all stake addresses associated to this chain. #[must_use] pub fn stake_addresses(&self) -> HashSet {