fix(cardano-blockchain-types): cip36 now contain validation

Signed-off-by: bkioshn <[email protected]>

Author: bkioshn

rust/cardano-blockchain-types/src/metadata/cip36/mod.rs

@@ -11,10 +11,10 @@ use key_registration::Cip36KeyRegistration;
 use minicbor::{Decode, Decoder};
 use pallas::ledger::addresses::ShelleyAddress;
 use registration_witness::Cip36RegistrationWitness;
-use validation::{validate_payment_address_network, validate_signature, validate_voting_keys};
+use validation::{validate_cip36, Cip36Validation};
 use voting_pk::VotingPubKey;
 
-use crate::{MetadatumLabel, MetadatumValue, MultiEraBlock, Network, TxnIndex};
+use crate::{MetadatumLabel, MultiEraBlock, TxnIndex};
 
 /// CIP-36 Catalyst registration
 #[derive(Clone, Default, Debug)]
@@ -25,20 +25,9 @@ pub struct Cip36 {
     registration_witness: Cip36RegistrationWitness,
     /// Is this a Catalyst strict registration?
     is_catalyst_strict: bool,
-}
-
-/// Validation value for CIP-36.
-#[allow(clippy::struct_excessive_bools, clippy::module_name_repetitions)]
-#[derive(Clone, Default, Debug)]
-pub(crate) struct Cip36Validation {
-    /// Is the signature valid? (signature in 61285)
-    pub is_valid_signature: bool,
-    /// Is the payment address on the correct network?
-    pub is_valid_payment_address_network: bool,
-    /// Is the voting keys valid?
-    pub is_valid_voting_keys: bool,
-    /// Is the purpose valid? (Always 0 for Catalyst)
-    pub is_valid_purpose: bool,
+    /// CIP36 validation.
+    #[allow(dead_code)]
+    validation: Cip36Validation,
 }
 
 impl Cip36 {
@@ -97,24 +86,29 @@ impl Cip36 {
                 },
             };
 
+        let mut validation_report = Vec::new();
+        // If the code reach here, then the CIP36 decoding is successful.
+        let validation = validate_cip36(
+            &key_registration,
+            &registration_witness,
+            is_catalyst_strict,
+            network,
+            k61284,
+            &mut validation_report,
+        );
+
         let cip36 = Self {
             key_registration,
             registration_witness,
             is_catalyst_strict,
+            validation,
         };
 
-        let mut validation_report = Vec::new();
-        // If the code reach here, then the CIP36 decoding is successful.
-        let validation = cip36.validate(network, k61284, &mut validation_report);
-
-        if validation.is_valid_signature
-            && validation.is_valid_payment_address_network
-            && validation.is_valid_voting_keys
-            && validation.is_valid_purpose
-        {
+        if validation_report.is_empty() {
             Ok(cip36)
         } else {
-            bail!("CIP-36 validation failed: {validation:?}, Reports: {validation_report:?}")
+            // If there are validation errors, the CIP36 is invalid
+            bail!("CIP-36 validation failed: {cip36:?}, Reports: {validation_report:?}")
         }
     }
 
@@ -179,36 +173,9 @@ impl Cip36 {
         self.is_catalyst_strict
     }
 
-    /// Validation for CIP-36
-    /// The validation include the following:
-    /// * Signature validation of the registration witness 61285 against the stake public
-    ///   key in key registration 61284.
-    /// * Payment address network validation against the network. The given network should
-    ///   match the network tag within the payment address.
-    /// * Purpose validation, the purpose should be 0 for Catalyst (when
-    ///   `is_strict_catalyst` is true).
-    /// * Voting keys validation, Catalyst supports only a single voting key per
-    ///   registration when `is_strict_catalyst` is true.
-    ///
-    /// # Parameters
-    ///
-    /// * `network` - The blockchain network.
-    /// * `metadata` - The metadata value to be validated.
-    /// * `validation_report` - Validation report to store the validation result.
-    fn validate(
-        &self, network: Network, metadata: &MetadatumValue, validation_report: &mut Vec<String>,
-    ) -> Cip36Validation {
-        let is_valid_signature = validate_signature(self, metadata, validation_report);
-        let is_valid_payment_address_network =
-            validate_payment_address_network(self, network, validation_report).unwrap_or_default();
-        let is_valid_voting_keys = validate_voting_keys(self, validation_report);
-        let is_valid_purpose = validation::validate_purpose(self, validation_report);
-
-        Cip36Validation {
-            is_valid_signature,
-            is_valid_payment_address_network,
-            is_valid_voting_keys,
-            is_valid_purpose,
-        }
+    /// Get the CIP-36 validation.
+    #[must_use]
+    pub fn validation(&self) -> &Cip36Validation {
+        &self.validation
     }
 }