git.delta.rocks / unique-network / refs/commits / 38470585a7b3

--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -1362,12 +1362,13 @@
 	pub fn get_collection_type(
 		collection_id: CollectionId,
 	) -> Result<misc::CollectionType, DispatchError> {
-		Self::get_collection_property_decoded(collection_id, CollectionType)
-			.map_err(|err| if err != <Error<T>>::CollectionUnknown.into() {
+		Self::get_collection_property_decoded(collection_id, CollectionType).map_err(|err| {
+			if err != <Error<T>>::CollectionUnknown.into() {
 				<Error<T>>::CorruptedCollectionType.into()
 			} else {
 				err
-			})
+			}
+		})
 	}
 
 	pub fn ensure_collection_type(

231				&collection,
232				&T::CrossAccountId::from_sub(sender),
233			)
232				.map_err(|err| if err == <CoreError<T>>::NoPermission.into() {234			.map_err(|err| {
235				if err == <CoreError<T>>::NoPermission.into() {
233					<Error<T>>::PermissionError.into()236					<Error<T>>::PermissionError.into()
234				} else {237				} else {
235					err238					err
236				})?;239				}
240			})?;
237241
238			let part_id = Self::internal_part_id(base_collection_id, slot_id)242			let part_id = Self::internal_part_id(base_collection_id, slot_id)
239				.ok_or(<Error<T>>::PartDoesntExist)?;243				.ok_or(<Error<T>>::PartDoesntExist)?;
256260
257			Self::deposit_event(Event::EquippablesUpdated {261			Self::deposit_event(Event::EquippablesUpdated { base_id, slot_id });
258				base_id,
259				slot_id,
260			});
261262
262			Ok(())263			Ok(())
335	fn get_base(base_id: CollectionId) -> Result<NonfungibleHandle<T>, DispatchError> {332	fn get_base(base_id: CollectionId) -> Result<NonfungibleHandle<T>, DispatchError> {
336		let collection = <PalletCore<T>>::get_typed_nft_collection(base_id, misc::CollectionType::Base)333		let collection =
334			<PalletCore<T>>::get_typed_nft_collection(base_id, misc::CollectionType::Base)
337			.map_err(|err| if err == <CoreError<T>>::CollectionUnknown.into() {335				.map_err(|err| {
336					if err == <CoreError<T>>::CollectionUnknown.into() {
338				<Error<T>>::BaseDoesntExist.into()337						<Error<T>>::BaseDoesntExist.into()
339			} else {338					} else {
340				err339						err
341			})?;340					}
341				})?;
342		collection.check_is_external()?;342		collection.check_is_external()?;
343343
344		Ok(collection)344		Ok(collection)

--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -987,7 +987,8 @@
 pub type RmrkResourceInfo = ResourceInfo<RmrkString, RmrkBoundedParts>;
 pub type RmrkPropertyInfo = PropertyInfo<RmrkKeyString, RmrkValueString>;
 pub type RmrkBaseInfo<AccountId> = BaseInfo<AccountId, RmrkString>;
-pub type BoundedEquippableCollectionIds = BoundedVec<RmrkCollectionId, RmrkMaxCollectionsEquippablePerPart>;
+pub type BoundedEquippableCollectionIds =
+	BoundedVec<RmrkCollectionId, RmrkMaxCollectionsEquippablePerPart>;
 pub type RmrkPartType = PartType<RmrkString, BoundedEquippableCollectionIds>;
 pub type RmrkEquippableList = EquippableList<BoundedEquippableCollectionIds>;
 pub type RmrkThemeProperty = ThemeProperty<RmrkString>;