refactor(dpp): change String and ByteArray DocumentPropertyType sizes…

… to structs (#1874)
dashpay · Jun 23, 2024 · e1e85b8 · e1e85b8
1 parent 9edcd10
commit e1e85b8
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 98 deletions.
diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v0/mod.rs
@@ -39,7 +39,9 @@ use crate::data_contract::document_type::property_names::{
     CAN_BE_DELETED, CREATION_RESTRICTION_MODE, DOCUMENTS_KEEP_HISTORY, DOCUMENTS_MUTABLE,
     TRADE_MODE, TRANSFERABLE,
 };
-use crate::data_contract::document_type::{property_names, DocumentType};
+use crate::data_contract::document_type::{
+    property_names, ByteArrayPropertySizes, DocumentType, StringPropertySizes,
+};
 use crate::data_contract::errors::DataContractError;
 use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements;
 use crate::identity::SecurityLevel;
@@ -383,7 +385,7 @@ impl DocumentTypeV0 {
                                         })?;
 
                                     // Validate indexed property type
-                                    match property_definition.property_type {
+                                    match &property_definition.property_type {
                                         // Array and objects aren't supported for indexing yet
                                         DocumentPropertyType::Array(_)
                                         | DocumentPropertyType::Object(_)
@@ -399,9 +401,9 @@ impl DocumentTypeV0 {
                                             )))
                                         }
                                         // Indexed byte array size must be limited
-                                        DocumentPropertyType::ByteArray(_, maybe_max_size)
-                                            if maybe_max_size.is_none()
-                                                || maybe_max_size.unwrap()
+                                        DocumentPropertyType::ByteArray(sizes)
+                                            if sizes.max_size.is_none()
+                                                || sizes.max_size.unwrap()
                                                     > MAX_INDEXED_BYTE_ARRAY_PROPERTY_LENGTH =>
                                         {
                                             Err(ProtocolError::ConsensusError(Box::new(
@@ -419,9 +421,9 @@ impl DocumentTypeV0 {
                                             )))
                                         }
                                         // Indexed string length must be limited
-                                        DocumentPropertyType::String(_, maybe_max_length)
-                                            if maybe_max_length.is_none()
-                                                || maybe_max_length.unwrap()
+                                        DocumentPropertyType::String(sizes)
+                                            if sizes.max_length.is_none()
+                                                || sizes.max_length.unwrap()
                                                     > MAX_INDEXED_STRING_PROPERTY_LENGTH =>
                                         {
                                             Err(ProtocolError::ConsensusError(Box::new(
@@ -567,12 +569,14 @@ fn insert_values(
                                 Some("application/x.dash.dpp.identifier") => {
                                     DocumentPropertyType::Identifier
                                 }
-                                Some(_) | None => DocumentPropertyType::ByteArray(
-                                    inner_properties
-                                        .get_optional_integer(property_names::MIN_ITEMS)?,
-                                    inner_properties
-                                        .get_optional_integer(property_names::MAX_ITEMS)?,
-                                ),
+                                Some(_) | None => {
+                                    DocumentPropertyType::ByteArray(ByteArrayPropertySizes {
+                                        min_size: inner_properties
+                                            .get_optional_integer(property_names::MIN_ITEMS)?,
+                                        max_size: inner_properties
+                                            .get_optional_integer(property_names::MAX_ITEMS)?,
+                                    })
+                                }
                             }
                         } else {
                             return Err(DataContractError::InvalidContractStructure(
@@ -622,10 +626,12 @@ fn insert_values(
             }
 
             "string" => {
-                field_type = DocumentPropertyType::String(
-                    inner_properties.get_optional_integer(property_names::MIN_LENGTH)?,
-                    inner_properties.get_optional_integer(property_names::MAX_LENGTH)?,
-                );
+                field_type = DocumentPropertyType::String(StringPropertySizes {
+                    min_length: inner_properties
+                        .get_optional_integer(property_names::MIN_LENGTH)?,
+                    max_length: inner_properties
+                        .get_optional_integer(property_names::MAX_LENGTH)?,
+                });
                 document_properties.insert(
                     prefixed_property_key,
                     DocumentProperty {
@@ -673,10 +679,10 @@ fn insert_values_nested(
     let field_type = match type_value {
         "integer" => DocumentPropertyType::Integer,
         "number" => DocumentPropertyType::Number,
-        "string" => DocumentPropertyType::String(
-            inner_properties.get_optional_integer(property_names::MIN_LENGTH)?,
-            inner_properties.get_optional_integer(property_names::MAX_LENGTH)?,
-        ),
+        "string" => DocumentPropertyType::String(StringPropertySizes {
+            min_length: inner_properties.get_optional_integer(property_names::MIN_LENGTH)?,
+            max_length: inner_properties.get_optional_integer(property_names::MAX_LENGTH)?,
+        }),
         "array" => {
             // Only handling bytearrays for v1
             // Return an error if it is not a byte array
@@ -689,10 +695,14 @@ fn insert_values_nested(
                             Some("application/x.dash.dpp.identifier") => {
                                 DocumentPropertyType::Identifier
                             }
-                            Some(_) | None => DocumentPropertyType::ByteArray(
-                                inner_properties.get_optional_integer(property_names::MIN_ITEMS)?,
-                                inner_properties.get_optional_integer(property_names::MAX_ITEMS)?,
-                            ),
+                            Some(_) | None => {
+                                DocumentPropertyType::ByteArray(ByteArrayPropertySizes {
+                                    min_size: inner_properties
+                                        .get_optional_integer(property_names::MIN_ITEMS)?,
+                                    max_size: inner_properties
+                                        .get_optional_integer(property_names::MAX_ITEMS)?,
+                                })
+                            }
                         }
                     } else {
                         return Err(DataContractError::InvalidContractStructure(