chore: merge methods

Author: apskhem

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

@@ -86,55 +86,33 @@ impl RegistrationChain {
         })
     }
 
-    /// Attempts to update an existing RBAC registration chain
-    /// with a new CIP-509 registration, validating address and key usage consistency.
-    ///
-    /// # Returns
-    /// - `Ok((new_chain, validation_result))` if the chain was successfully updated and
-    ///   validated.
+    /// Creates or updates an RBAC registration chain from a CIP-509 registration.
     ///
-    /// # Errors
-    /// - Returns [`RbacValidationError::UnknownCatalystId`] if no Catalyst chain is found
-    ///   for `previous_txn`.
-    /// - Returns [`RbacValidationError::InvalidRegistration`] if address/key duplication
-    ///   or validation inconsistencies are detected.
-    #[must_use]
-    pub async fn update_from_previous_txn<Provider>(
-        &self,
-        reg: Cip509,
-        previous_txn: TransactionId,
-        provider: &Provider,
-    ) -> Result<RegistrationChain, RbacValidationError>
-    where
-        Provider: RbacRegistrationProvider,
-    {
-        self.inner
-            .update_from_previous_txn(reg, previous_txn, provider)
-            .await
-    }
-
-    /// Attempts to initialize a new RBAC registration chain
-    /// from a given CIP-509 registration, ensuring uniqueness of Catalyst ID, stake
-    /// addresses, and associated public keys.
+    /// If the given registration references a previous transaction, it attempts
+    /// to update the existing chain using that previous transaction.  
+    /// Otherwise, it starts a new chain from the provided registration.
     ///
     /// # Returns
-    /// - `Ok((new_chain, validation_result))` if the chain was successfully initialized
-    ///   and validated.
+    /// - `Ok(Self)` if the chain was successfully initialized or updated and validated.
     ///
     /// # Errors
-    /// - [`RbacValidationError::UnknownCatalystId`]: if `reg` lacks a valid Catalyst ID.
-    /// - [`RbacValidationError::InvalidRegistration`]: if any functional validation,
-    ///   stake address conflict, or public key duplication occurs.
+    /// - [`RbacValidationError::UnknownCatalystId`] if no Catalyst chain can be found or
+    ///   inferred.
+    /// - [`RbacValidationError::InvalidRegistration`] if any validation, address, or key
+    ///   duplication inconsistencies are detected.
     #[must_use]
-    pub async fn start_from_provider<Provider>(
-        &self,
+    pub async fn update_from_previous_txn<Provider>(
         reg: Cip509,
         provider: &Provider,
-    ) -> Result<RegistrationChain, RbacValidationError>
+    ) -> Result<Self, RbacValidationError>
     where
         Provider: RbacRegistrationProvider,
     {
-        self.inner.start_from_provider(reg, provider).await
+        if let Some(previous_txn) = reg.previous_transaction() {
+            RegistrationChainInner::update_from_previous_txn(reg, previous_txn, provider).await
+        } else {
+            RegistrationChainInner::start_from_provider(reg, provider).await
+        }
     }
 
     /// Validates that none of the signing keys in a given RBAC registration chain
@@ -633,7 +611,6 @@ impl RegistrationChainInner {
     ///   or validation inconsistencies are detected.
     #[must_use]
     pub async fn update_from_previous_txn<Provider>(
-        &self,
         reg: Cip509,
         previous_txn: TransactionId,
         provider: &Provider,
@@ -709,7 +686,6 @@ impl RegistrationChainInner {
     ///   stake address conflict, or public key duplication occurs.
     #[must_use]
     pub async fn start_from_provider<Provider>(
-        &self,
         reg: Cip509,
         provider: &Provider,
     ) -> Result<RegistrationChain, RbacValidationError>