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

difftreelog

cargo fmt

Daniel Shiposha2022-06-20parent: #3e410d6.patch.diff
in: master

3 files changed

modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
--- 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(
modifiedpallets/proxy-rmrk-equip/src/lib.rsdiffbeforeafterboth
--- a/pallets/proxy-rmrk-equip/src/lib.rs
+++ b/pallets/proxy-rmrk-equip/src/lib.rs
@@ -22,8 +22,7 @@
 use up_data_structs::*;
 use pallet_common::{Pallet as PalletCommon, Error as CommonError};
 use pallet_rmrk_core::{
-	Pallet as PalletCore,
-	Error as CoreError,
+	Pallet as PalletCore, Error as CoreError,
 	misc::{self, *},
 	property::RmrkProperty::*,
 };
@@ -228,12 +227,17 @@
 			let base_collection_id = base_id.into();
 			let collection = Self::get_base(base_collection_id)?;
 
-			<PalletCore<T>>::check_collection_owner(&collection, &T::CrossAccountId::from_sub(sender))
-				.map_err(|err| if err == <CoreError<T>>::NoPermission.into() {
+			<PalletCore<T>>::check_collection_owner(
+				&collection,
+				&T::CrossAccountId::from_sub(sender),
+			)
+			.map_err(|err| {
+				if err == <CoreError<T>>::NoPermission.into() {
 					<Error<T>>::PermissionError.into()
 				} else {
 					err
-				})?;
+				}
+			})?;
 
 			let part_id = Self::internal_part_id(base_collection_id, slot_id)
 				.ok_or(<Error<T>>::PartDoesntExist)?;
@@ -254,10 +258,7 @@
 				}
 			}
 
-			Self::deposit_event(Event::EquippablesUpdated {
-				base_id,
-				slot_id,
-			});
+			Self::deposit_event(Event::EquippablesUpdated { base_id, slot_id });
 
 			Ok(())
 		}
@@ -284,16 +285,12 @@
 		let token_id = match Self::internal_part_id(collection.id, part_id) {
 			Some(token_id) => token_id,
 			None => {
-				let token_id = <PalletCore<T>>::create_nft(
-					sender,
-					owner,
-					collection,
-					[].into_iter(),
-				)
-				.map_err(|err| match err {
-					DispatchError::Arithmetic(_) => <Error<T>>::NoAvailablePartId.into(),
-					err => err,
-				})?;
+				let token_id =
+					<PalletCore<T>>::create_nft(sender, owner, collection, [].into_iter())
+						.map_err(|err| match err {
+							DispatchError::Arithmetic(_) => <Error<T>>::NoAvailablePartId.into(),
+							err => err,
+						})?;
 
 				<InernalPartId<T>>::insert(collection.id, part_id, token_id);
 
@@ -317,7 +314,7 @@
 				<PalletCore<T>>::rmrk_property(Src, &src)?,
 				<PalletCore<T>>::rmrk_property(ZIndex, &z_index)?,
 			]
-			.into_iter()
+			.into_iter(),
 		)?;
 
 		if let RmrkPartType::SlotPart(part) = part {
@@ -325,7 +322,7 @@
 				collection.id,
 				token_id,
 				PropertyScope::Rmrk,
-				<PalletCore<T>>::rmrk_property(EquippableList, &part.equippable)?
+				<PalletCore<T>>::rmrk_property(EquippableList, &part.equippable)?,
 			)?;
 		}
 
@@ -333,12 +330,15 @@
 	}
 
 	fn get_base(base_id: CollectionId) -> Result<NonfungibleHandle<T>, DispatchError> {
-		let collection = <PalletCore<T>>::get_typed_nft_collection(base_id, misc::CollectionType::Base)
-			.map_err(|err| if err == <CoreError<T>>::CollectionUnknown.into() {
-				<Error<T>>::BaseDoesntExist.into()
-			} else {
-				err
-			})?;
+		let collection =
+			<PalletCore<T>>::get_typed_nft_collection(base_id, misc::CollectionType::Base)
+				.map_err(|err| {
+					if err == <CoreError<T>>::CollectionUnknown.into() {
+						<Error<T>>::BaseDoesntExist.into()
+					} else {
+						err
+					}
+				})?;
 		collection.check_is_external()?;
 
 		Ok(collection)
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth

no syntactic changes