Merge pull request #136 from rmrk-team/bug/120-split-resource-into-composable-slot-basic

Bug/120 split resource into composable slot basic

Author: bmacer

pallets/rmrk-core/src/functions.rs

@@ -80,42 +80,23 @@ where
 		collection_id: CollectionId,
 		nft_id: NftId,
 		resource_id: BoundedResource<T::ResourceSymbolLimit>,
-		base: Option<BaseId>,
-		src: Option<BoundedVec<u8, T::StringLimit>>,
-		metadata: Option<BoundedVec<u8, T::StringLimit>>,
-		slot: Option<SlotId>,
-		license: Option<BoundedVec<u8, T::StringLimit>>,
-		thumb: Option<BoundedVec<u8, T::StringLimit>>,
-		parts: Option<BoundedVec<PartId, T::PartsLimit>>,
+		resource: ResourceTypes<BoundedVec<u8, T::StringLimit>, BoundedVec<PartId, T::PartsLimit>>,
 	) -> DispatchResult {
 		let collection = Self::collections(collection_id).ok_or(Error::<T>::CollectionUnknown)?;
 		ensure!(collection.issuer == sender, Error::<T>::NoPermission);
 		let (root_owner, _) = Pallet::<T>::lookup_root_owner(collection_id, nft_id)?;
 		// Check NFT lock status
 		ensure!(!Pallet::<T>::is_locked(collection_id, nft_id), pallet_uniques::Error::<T>::Locked);
 
-		let empty =
-			base.is_none() &&
-				src.is_none() && metadata.is_none() &&
-				slot.is_none() && license.is_none() &&
-				thumb.is_none();
-		ensure!(!empty, Error::<T>::EmptyResource);
-
 		let res = ResourceInfo::<
 			BoundedVec<u8, T::ResourceSymbolLimit>,
 			BoundedVec<u8, T::StringLimit>,
 			BoundedVec<PartId, T::PartsLimit>,
 		> {
 			id: resource_id.clone(),
-			base,
-			src,
-			metadata,
-			slot,
-			license,
-			thumb,
-			parts,
 			pending: root_owner != sender,
 			pending_removal: false,
+			resource
 		};
 		Resources::<T>::insert((collection_id, nft_id, resource_id), res);
 

pallets/rmrk-core/src/lib.rs

@@ -13,6 +13,7 @@ use sp_std::convert::TryInto;
 use rmrk_traits::{
 	primitives::*, AccountIdOrCollectionNftTuple, Collection, CollectionInfo, Nft, NftInfo,
 	Priority, Property, Resource, ResourceInfo, RoyaltyInfo,
+	ResourceTypes, BasicResource, SlotResource, ComposableResource
 };
 use sp_std::result::Result;
 
@@ -574,21 +575,15 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Create resource
+		/// Create basic resource
 		#[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]
 		#[transactional]
-		pub fn add_resource(
+		pub fn add_basic_resource(
 			origin: OriginFor<T>,
 			collection_id: CollectionId,
 			nft_id: NftId,
 			resource_id: BoundedResource<T::ResourceSymbolLimit>,
-			base: Option<BaseId>,
-			src: Option<BoundedVec<u8, T::StringLimit>>,
-			metadata: Option<BoundedVec<u8, T::StringLimit>>,
-			slot: Option<SlotId>,
-			license: Option<BoundedVec<u8, T::StringLimit>>,
-			thumb: Option<BoundedVec<u8, T::StringLimit>>,
-			parts: Option<BoundedVec<PartId, T::PartsLimit>>,
+			resource: BasicResource<StringLimitOf<T>>,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin.clone())?;
 
@@ -597,13 +592,55 @@ pub mod pallet {
 				collection_id,
 				nft_id,
 				resource_id.clone(),
-				base,
-				src,
-				metadata,
-				slot,
-				license,
-				thumb,
-				parts,
+				ResourceTypes::Basic(resource),
+			)?;
+
+			Self::deposit_event(Event::ResourceAdded { nft_id, resource_id });
+			Ok(())
+		}
+
+		/// Create composable resource
+		#[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]
+		#[transactional]
+		pub fn add_composable_resource(
+			origin: OriginFor<T>,
+			collection_id: CollectionId,
+			nft_id: NftId,
+			resource_id: BoundedResource<T::ResourceSymbolLimit>,
+			resource: ComposableResource<StringLimitOf<T>, BoundedVec<PartId, T::PartsLimit>>,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin.clone())?;
+
+			Self::resource_add(
+				sender,
+				collection_id,
+				nft_id,
+				resource_id.clone(),
+				ResourceTypes::Composable(resource),
+			)?;
+
+			Self::deposit_event(Event::ResourceAdded { nft_id, resource_id });
+			Ok(())
+		}
+
+		/// Create slot resource
+		#[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]
+		#[transactional]
+		pub fn add_slot_resource(
+			origin: OriginFor<T>,
+			collection_id: CollectionId,
+			nft_id: NftId,
+			resource_id: BoundedResource<T::ResourceSymbolLimit>,
+			resource: SlotResource<StringLimitOf<T>>,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin.clone())?;
+
+			Self::resource_add(
+				sender,
+				collection_id,
+				nft_id,
+				resource_id.clone(),
+				ResourceTypes::Slot(resource),
 			)?;
 
 			Self::deposit_event(Event::ResourceAdded { nft_id, resource_id });