- Overhauled the set_up_application function in the Gated Marketplace pallet. Removed the separate validate_fields function and integrated its validation logic directly into set_up_application, providing field validation in the same context as application setup. This resulted in more streamlined validation, ensuring a non-empty fields list and correct matching of fields and custodian fields sizes directly in the application setup. Added error handling for the case that the number of application fields exceeds the maximum limit.

- Adjusted the Gated Marketplace pallet structure and error definitions. Added the `ExceedMaxFilesApplication` error to handle scenarios where the number of application files surpasses the allowable maximum. This new error is now part of the error returns in the `enroll_application` and `enroll_self_managed_application` functions, improving the robustness and user feedback of our enrollment operations.

Author: didiermis

pallets/gated-marketplace/src/functions.rs

@@ -135,8 +135,7 @@ impl<T: Config> Pallet<T> {
 		// ensure the origin is owner or admin
 		Self::is_authorized(authority.clone(), &marketplace_id, Permission::Enroll)?;
 
-		Self::validate_fields(&fields, &custodian_fields)?;
-		let (custodian, fields) = Self::set_up_application(fields, custodian_fields);
+		let (custodian, fields) = Self::set_up_application(fields, custodian_fields)?;
 
 		let application = Application::<T> {
 			status: ApplicationStatus::default(),
@@ -795,29 +794,12 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/* ---- Helper functions ---- */
-	pub fn validate_fields(
-		fields: &Fields<T>,
-		custodian_fields: &Option<CustodianFields<T>>,
-	) -> DispatchResult {
-		match custodian_fields {
-			Some(c_fields) => {
-				if fields.len() != c_fields.1.len() {
-					return Err(Error::<T>::InsufficientCustodianFields.into())
-				}
-			}
-			None => {
-				if fields.is_empty() {
-					return Err(Error::<T>::FieldsNotProvided.into())
-				}
-			}
-		}
-		Ok(())
-	}
-
 	pub fn set_up_application(
 		fields: Fields<T>,
 		custodian_fields: Option<CustodianFields<T>>,
-	) -> (Option<T::AccountId>, BoundedVec<ApplicationField, T::MaxFiles>) {
+	) -> Result<(Option<T::AccountId>, BoundedVec<ApplicationField, T::MaxFiles>), DispatchError> {	
+		ensure!(!fields.is_empty(), Error::<T>::FieldsNotProvided);
+
 		let mut f: Vec<ApplicationField> = fields
 			.iter()
 			.map(|tuple| ApplicationField {
@@ -826,16 +808,23 @@ impl<T: Config> Pallet<T> {
 				custodian_cid: None,
 			})
 			.collect();
+
 		let custodian = match custodian_fields {
 			Some(c_fields) => {
+				if fields.len() != c_fields.1.len() {
+					return Err(Error::<T>::InsufficientCustodianFields.into())
+				}
 				for (i, field) in f.iter_mut().enumerate() {
 					field.custodian_cid = Some(c_fields.1[i].clone());
 				}
 				Some(c_fields.0)
 			},
 			_ => None,
 		};
-		(custodian, BoundedVec::<ApplicationField, T::MaxFiles>::try_from(f).unwrap_or_default())
+
+		let fields = BoundedVec::<ApplicationField, T::MaxFiles>::try_from(f).
+			map_err(|_| Error::<T>::ExceedMaxFilesApplication)?;
+		Ok((custodian, fields))
 	}
 
 	fn insert_in_auth_market_lists(

pallets/gated-marketplace/src/lib.rs

@@ -341,7 +341,9 @@ pub mod pallet {
 		/// Not enough custodian fields provided
 		InsufficientCustodianFields,
 		/// Fields not provided for the application
-		FieldsNotProvided
+		FieldsNotProvided,
+		/// Exceeds the maximum number of files
+		ExceedMaxFilesApplication,
 	}
 
 	#[pallet::call]
@@ -439,8 +441,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
-			Self::validate_fields(&fields, &custodian_fields)?;
-			let (custodian, fields) = Self::set_up_application(fields, custodian_fields);
+			let (custodian, fields) = Self::set_up_application(fields, custodian_fields)?;
 
 			let application = Application::<T> {
 				status: ApplicationStatus::default(),
@@ -478,8 +479,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
-			Self::validate_fields(&fields, &custodian_fields)?;
-			let (custodian, fields) = Self::set_up_application(fields, custodian_fields);
+			let (custodian, fields) = Self::set_up_application(fields, custodian_fields)?;
 
 			let application = Application::<T> {
 				status: ApplicationStatus::default(),