rename state to Provider

Author: Mr-Leshiy

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

@@ -1,4 +1,4 @@
 //! Cardano module
 
 pub mod cip509;
-pub mod state;
+pub mod provider;

rust/rbac-registration/src/cardano/state.rs renamed to rust/rbac-registration/src/cardano/provider.rs

@@ -1,5 +1,4 @@
-//! Cardano RBAC state traits, which are used during different stateful validation
-//! procedures.
+//! Cardano RBAC provider trait, which are used during different stateful validation procedures.
 
 use std::future::Future;
 
@@ -9,8 +8,8 @@ use ed25519_dalek::VerifyingKey;
 
 use crate::registration::cardano::RegistrationChain;
 
-/// RBAC chains state trait
-pub trait RbacChainsState {
+/// RBAC chains provider trait
+pub trait RbacChainsProvider: Send + Sync {
     /// Returns RBAC chain for the given Catalyst ID.
     fn chain(
         &self,
@@ -21,28 +20,33 @@ pub trait RbacChainsState {
     fn is_chain_known(
         &self,
         id: &CatalystId,
-    ) -> impl Future<Output = anyhow::Result<bool>> + Send;
+    ) -> impl Future<Output = anyhow::Result<bool>> + Send {
+        async { self.chain(id).await.map(|v| v.is_some()) }
+    }
+
+    /// Returns the Catalyst ID associated with the RBAC chain for the given stake
+    /// address.
+    fn chain_catalyst_id_from_stake_address(
+        &self,
+        addr: &StakeAddress,
+    ) -> impl Future<Output = anyhow::Result<Option<CatalystId>>> + Send;
 
     /// Returns `true` if a provided address already used by any RBAC chain.
     fn is_stake_address_used(
         &self,
         addr: &StakeAddress,
-    ) -> impl Future<Output = anyhow::Result<bool>> + Send;
-
-    /// Returns the Catalyst ID associated with the RBAC chain for the given signing public key
-    /// signing public key.
+    ) -> impl Future<Output = anyhow::Result<bool>> + Send {
+        async {
+            self.chain_catalyst_id_from_stake_address(addr)
+                .await
+                .map(|v| v.is_some())
+        }
+    }
+
+    /// Returns the Catalyst ID associated with the RBAC chain for the given signing
+    /// public key.
     fn chain_catalyst_id_from_signing_public_key(
         &self,
         key: &VerifyingKey,
     ) -> impl Future<Output = anyhow::Result<Option<CatalystId>>> + Send;
-
-    /// Update currently assosiated with the stake addresses chains by "taking" the given `StakeAddress` for the corresponding
-    /// RBAC chain's by the given `CatalystId`.
-    fn take_stake_address_from_chains<I>(
-        &mut self,
-        addresses: I,
-    ) -> impl Future<Output = anyhow::Result<()>> + Send
-    where
-        I: IntoIterator<Item = StakeAddress> + Send,
-        <I as IntoIterator>::IntoIter: Send;
 }

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

@@ -27,7 +27,7 @@ use crate::cardano::{
         CertKeyHash, CertOrPk, Cip0134UriSet, Cip509, PaymentHistory, PointData, PointTxnIdx,
         RoleData, RoleDataRecord, ValidationSignature,
     },
-    state::RbacChainsState,
+    provider::RbacChainsProvider,
 };
 
 /// Registration chains.
@@ -50,12 +50,10 @@ impl RegistrationChain {
     /// # Errors
     ///  - Propagates any I/O or provider-level errors encountered while checking key
     ///    ownership (e.g., database lookup failures).
-    pub async fn new<State>(
+    pub async fn new(
         cip509: &Cip509,
-        state: &mut State,
+        provider: &impl RbacChainsProvider,
     ) -> anyhow::Result<Option<Self>>
-    where
-        State: RbacChainsState,
     {
         let Some(new_chain) = Self::new_stateless(cip509) else {
             return Ok(None);
@@ -64,24 +62,20 @@ impl RegistrationChain {
         // Verify that a Catalyst ID of this chain is unique.
         {
             let cat_id = new_chain.catalyst_id();
-            if state.is_chain_known(cat_id).await? {
+            if provider.is_chain_known(cat_id).await? {
                 cip509.report().functional_validation(
             &format!("{} is already used", cat_id.as_short_id()),
                 "It isn't allowed to use same Catalyst ID (certificate subject public key) in multiple registration chains",
                     );
             }
 
-            check_signing_public_key(cat_id, cip509, state).await?;
+            check_signing_public_key(cat_id, cip509, provider).await?;
         }
 
         if cip509.report().is_problematic() {
             return Ok(None);
         }
 
-        state
-            .take_stake_address_from_chains(cip509.stake_addresses())
-            .await?;
-
         Ok(Some(new_chain))
     }
 
@@ -108,13 +102,11 @@ impl RegistrationChain {
     /// # Errors
     ///  - Propagates any I/O or provider-level errors encountered while checking key
     ///    ownership (e.g., database lookup failures).
-    pub async fn update<State>(
+    pub async fn update(
         &self,
         cip509: &Cip509,
-        state: &State,
+        provider: &impl RbacChainsProvider,
     ) -> anyhow::Result<Option<Self>>
-    where
-        State: RbacChainsState,
     {
         let Some(new_chain) = self.update_stateless(cip509) else {
             return Ok(None);
@@ -123,17 +115,19 @@ impl RegistrationChain {
         // Check that addresses from the new registration aren't used in other chains.
         let previous_stake_addresses = self.stake_addresses();
         let reg_stake_addresses = cip509.stake_addresses();
-        let new_stake_addresses: Vec<_> = reg_stake_addresses.difference(&previous_stake_addresses).collect();
+        let new_stake_addresses: Vec<_> = reg_stake_addresses
+            .difference(&previous_stake_addresses)
+            .collect();
         for address in &new_stake_addresses {
-            if state.is_stake_address_used(address).await? {
+            if provider.is_stake_address_used(address).await? {
                 cip509.report().functional_validation(
                         &format!("{address} stake address is already used"),
                         "It isn't allowed to use same stake address in multiple registration chains, if its not a new chain",
                     );
             }
         }
 
-        check_signing_public_key(self.catalyst_id(), cip509, state).await?;
+        check_signing_public_key(self.catalyst_id(), cip509, provider).await?;
 
         if cip509.report().is_problematic() {
             Ok(None)
@@ -737,7 +731,7 @@ async fn check_signing_public_key<State>(
     state: &State,
 ) -> anyhow::Result<()>
 where
-    State: RbacChainsState,
+    State: RbacChainsProvider,
 {
     for role in cip509.all_roles() {
         if let Some(key) = cip509.signing_public_key_for_role(role)