- Introduced a new helper function validate_fields in the Gated Marketplace pallet to validate the fields and custodian fields inputs before setting up an application. It throws an InsufficientCustodianFields error if the lengths of fields and custodian_fields do not match, and a FieldsNotProvided error if custodian fields are absent but fields are present.

- Incorporated the newly-created `validate_fields` helper function into the `create_marketplace` and `enroll_marketplace` functions in the Gated Marketplace pallet's `#[pallet::call]` section. This addition incorporates additional checks and enhances data accuracy. Also introduced a new type of error, `FieldsNotProvided`, in the pallet to handle scenarios where fields are not provided for the application.
- Performed a minor cleanup in the RBAC pallet configuration in mock.rs, reordering the fields for better clarity. Swapped the places of `RemoveOrigin` and `WeightInfo` fields to maintain consistent code order. No functionality was changed in this commit.

Author: didiermis

pallets/gated-marketplace/src/functions.rs

@@ -135,6 +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 application = Application::<T> {
@@ -794,6 +795,24 @@ 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>,
@@ -812,7 +831,6 @@ impl<T: Config> Pallet<T> {
 				for (i, field) in f.iter_mut().enumerate() {
 					field.custodian_cid = Some(c_fields.1[i].clone());
 				}
-
 				Some(c_fields.0)
 			},
 			_ => None,

pallets/gated-marketplace/src/lib.rs

@@ -338,6 +338,10 @@ pub mod pallet {
 		OwnerNotInMarketplace,
 		/// MappedAssetId not found
 		AssetNotFound,
+		/// Not enough custodian fields provided
+		InsufficientCustodianFields,
+		/// Fields not provided for the application
+		FieldsNotProvided
 	}
 
 	#[pallet::call]
@@ -435,6 +439,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 application = Application::<T> {
@@ -473,6 +478,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 application = Application::<T> {

pallets/gated-marketplace/src/mock.rs

@@ -163,24 +163,25 @@ impl pallet_balances::Config for Test {
 }
 
 parameter_types! {
-  pub const MaxScopesPerPallet: u32 = 2;
-  pub const MaxRolesPerPallet: u32 = 6;
-  pub const RoleMaxLen: u32 = 25;
-  pub const PermissionMaxLen: u32 = 25;
-  pub const MaxPermissionsPerRole: u32 = 30;
-  pub const MaxRolesPerUser: u32 = 2;
-  pub const MaxUsersPerRole: u32 = 2;
+	pub const MaxScopesPerPallet: u32 = 2;
+	pub const MaxRolesPerPallet: u32 = 6;
+	pub const RoleMaxLen: u32 = 25;
+	pub const PermissionMaxLen: u32 = 25;
+	pub const MaxPermissionsPerRole: u32 = 30;
+	pub const MaxRolesPerUser: u32 = 2;
+	pub const MaxUsersPerRole: u32 = 2;
 }
 impl pallet_rbac::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
+	type RemoveOrigin = EnsureRoot<Self::AccountId>;
 	type MaxScopesPerPallet = MaxScopesPerPallet;
 	type MaxRolesPerPallet = MaxRolesPerPallet;
 	type RoleMaxLen = RoleMaxLen;
 	type PermissionMaxLen = PermissionMaxLen;
 	type MaxPermissionsPerRole = MaxPermissionsPerRole;
 	type MaxRolesPerUser = MaxRolesPerUser;
 	type MaxUsersPerRole = MaxUsersPerRole;
-	type RemoveOrigin = EnsureRoot<Self::AccountId>;
+	type WeightInfo = ();
 }
 
 // Build genesis storage according to the mock runtime.