fix: some document error messages didnt specify the corresponding pro…

…perty (#1873)
dashpay · Jul 16, 2024 · 5405794 · 5405794
1 parent 9f4026f
commit 5405794
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/packages/rs-dpp/src/data_contract/document_type/property/mod.rs b/packages/rs-dpp/src/data_contract/document_type/property/mod.rs
@@ -562,7 +562,7 @@ impl DocumentPropertyType {
                     r_vec.extend(vec);
                     Ok(r_vec)
                 } else {
-                    Err(get_field_type_matching_error().into())
+                    Err(get_field_type_matching_error(&value).into())
                 }
             }
             DocumentPropertyType::Date => {
@@ -616,7 +616,9 @@ impl DocumentPropertyType {
                 Ok(r_vec)
             }
             DocumentPropertyType::Boolean => {
-                let value_as_boolean = value.as_bool().ok_or_else(get_field_type_matching_error)?;
+                let value_as_boolean = value
+                    .as_bool()
+                    .ok_or_else(|| get_field_type_matching_error(&value))?;
                 // 0 means does not exist
                 if value_as_boolean {
                     Ok(vec![1]) // 1 is true
@@ -652,7 +654,7 @@ impl DocumentPropertyType {
                     len_prepended_vec.append(&mut r_vec);
                     Ok(len_prepended_vec)
                 } else {
-                    Err(get_field_type_matching_error().into())
+                    Err(get_field_type_matching_error(&value).into())
                 }
             }
             DocumentPropertyType::Array(array_field_type) => {
@@ -667,7 +669,7 @@ impl DocumentPropertyType {
                     })?;
                     Ok(r_vec)
                 } else {
-                    Err(get_field_type_matching_error().into())
+                    Err(get_field_type_matching_error(&value).into())
                 }
             }
             DocumentPropertyType::VariableTypeArray(_) => Err(ProtocolError::DataContractError(
@@ -688,7 +690,9 @@ impl DocumentPropertyType {
         }
         return match self {
             DocumentPropertyType::String(_) => {
-                let value_as_text = value.as_text().ok_or_else(get_field_type_matching_error)?;
+                let value_as_text = value
+                    .as_text()
+                    .ok_or_else(|| get_field_type_matching_error(value))?;
                 let vec = value_as_text.as_bytes().to_vec();
                 let mut r_vec = vec.len().encode_var_vec();
                 r_vec.extend(vec);
@@ -728,7 +732,9 @@ impl DocumentPropertyType {
             },
             DocumentPropertyType::Identifier => Ok(value.to_identifier_bytes()?),
             DocumentPropertyType::Boolean => {
-                let value_as_boolean = value.as_bool().ok_or_else(get_field_type_matching_error)?;
+                let value_as_boolean = value
+                    .as_bool()
+                    .ok_or_else(|| get_field_type_matching_error(value))?;
                 // 0 means does not exist
                 if value_as_boolean {
                     Ok(vec![1]) // 1 is true
@@ -738,7 +744,7 @@ impl DocumentPropertyType {
             }
             DocumentPropertyType::Object(inner_fields) => {
                 let Some(value_map) = value.as_map() else {
-                    return Err(get_field_type_matching_error().into());
+                    return Err(get_field_type_matching_error(value).into());
                 };
                 let value_map = Value::map_ref_into_btree_string_map(value_map)?;
                 let mut r_vec = vec![];
@@ -780,7 +786,7 @@ impl DocumentPropertyType {
                     })?;
                     Ok(r_vec)
                 } else {
-                    Err(get_field_type_matching_error().into())
+                    Err(get_field_type_matching_error(value).into())
                 }
             }
 
@@ -799,7 +805,9 @@ impl DocumentPropertyType {
         }
         match self {
             DocumentPropertyType::String(_) => {
-                let value_as_text = value.as_text().ok_or_else(get_field_type_matching_error)?;
+                let value_as_text = value
+                    .as_text()
+                    .ok_or_else(|| get_field_type_matching_error(value))?;
                 let vec = value_as_text.as_bytes().to_vec();
                 if vec.is_empty() {
                     // we don't want to collide with the definition of an empty string
@@ -826,7 +834,9 @@ impl DocumentPropertyType {
                 .to_identifier_bytes()
                 .map_err(ProtocolError::ValueError),
             DocumentPropertyType::Boolean => {
-                let value_as_boolean = value.as_bool().ok_or_else(get_field_type_matching_error)?;
+                let value_as_boolean = value
+                    .as_bool()
+                    .ok_or_else(|| get_field_type_matching_error(value))?;
                 if value_as_boolean {
                     Ok(vec![1])
                 } else {
@@ -1205,8 +1215,9 @@ impl DocumentPropertyType {
     }
 }
 
-fn get_field_type_matching_error() -> DataContractError {
-    DataContractError::ValueWrongType(
-        "document field type doesn't match document value".to_string(),
-    )
+fn get_field_type_matching_error(value: &Value) -> DataContractError {
+    DataContractError::ValueWrongType(format!(
+        "document field type doesn't match \"{}\" document value",
+        value
+    ))
 }
diff --git a/...rc/errors/consensus/basic/document/missing_positions_in_document_type_properties_error.rs b/...rc/errors/consensus/basic/document/missing_positions_in_document_type_properties_error.rs
@@ -19,7 +19,10 @@ use platform_value::Identifier;
     PlatformSerialize,
     PlatformDeserialize,
 )]
-#[error("missing position is not present for updated document type")]
+#[error(
+    "position field is not present for document type \"{}\"",
+    document_type_name
+)]
 #[platform_serialize(unversioned)]
 pub struct MissingPositionsInDocumentTypePropertiesError {
     /*