Merge pull request #216 from rmrk-team/bug/191-resource-removal-equippable-base-and-slot-dont-update

fix 191 resource removal

Author: ilionic

pallets/rmrk-core/src/functions.rs

@@ -188,7 +188,6 @@ where
 			Resources::<T>::contains_key((collection_id, nft_id, resource_id)),
 			Error::<T>::ResourceDoesntExist
 		);
-
 		if pending_resource {
 			Resources::<T>::try_mutate_exists(
 				(collection_id, nft_id, resource_id),
@@ -200,7 +199,17 @@ where
 				},
 			)?;
 		} else {
-			Resources::<T>::remove((collection_id, nft_id, resource_id));
+			match Resources::<T>::get((collection_id, nft_id, &resource_id)) {
+				None => (),
+				Some(res) => {
+					Self::do_remove_resource_from_bases_and_equippable_slots(
+						res,
+						collection_id,
+						nft_id,
+						resource_id,
+					);
+				},
+			}
 		}
 
 		Self::deposit_event(Event::ResourceRemoval { nft_id, resource_id, collection_id });
@@ -218,17 +227,18 @@ where
 			Resources::<T>::contains_key((collection_id, nft_id, &resource_id)),
 			Error::<T>::ResourceDoesntExist
 		);
-
-		Resources::<T>::try_mutate_exists(
-			(collection_id, nft_id, resource_id),
-			|resource| -> DispatchResult {
-				if let Some(res) = resource {
-					ensure!(res.pending_removal, Error::<T>::ResourceNotPending);
-					*resource = None;
-				}
-				Ok(())
+		match Resources::<T>::get((collection_id, nft_id, &resource_id)) {
+			None => (),
+			Some(res) => {
+				ensure!(res.pending_removal, Error::<T>::ResourceNotPending);
+				Self::do_remove_resource_from_bases_and_equippable_slots(
+					res,
+					collection_id,
+					nft_id,
+					resource_id,
+				);
 			},
-		)?;
+		}
 
 		Self::deposit_event(Event::ResourceRemovalAccepted { nft_id, resource_id, collection_id });
 
@@ -969,4 +979,28 @@ where
 		ensure!(!nft.equipped, Error::<T>::CannotSendEquippedItem);
 		Ok(())
 	}
+
+	pub fn do_remove_resource_from_bases_and_equippable_slots(
+		res: ResourceInfoOf<T>,
+		collection_id: CollectionId,
+		nft_id: NftId,
+		resource_id: ResourceId,
+	) -> () {
+		match res.resource {
+			ResourceTypes::Basic(_r) => {
+				Resources::<T>::remove((collection_id, nft_id, resource_id));
+			},
+			ResourceTypes::Slot(r) => {
+				EquippableSlots::<T>::remove((collection_id, nft_id, resource_id, r.base, r.slot));
+				Resources::<T>::remove((collection_id, nft_id, resource_id));
+			},
+			ResourceTypes::Composable(r) => {
+				EquippableBases::<T>::remove((collection_id, nft_id, r.base));
+				if let Some((base, slot)) = r.slot {
+					EquippableSlots::<T>::remove((collection_id, nft_id, resource_id, base, slot));
+				};
+				Resources::<T>::remove((collection_id, nft_id, resource_id));
+			},
+		}
+	}
 }

pallets/rmrk-core/src/tests.rs

@@ -1427,6 +1427,43 @@ fn resource_removal_works() {
 		}));
 		// Since ALICE rootowns NFT, resource should be removed
 		assert_eq!(RMRKCore::resources((0, 0, 0)), None);
+
+		let base_id = 11;
+		let slot_id = 22;
+		let resource_id = 10;
+
+		// Create Composable resource
+		let composable_resource = ComposableResource {
+			parts: vec![0, 1].try_into().unwrap(), // BoundedVec of Parts
+			base: base_id,                               // base_id
+			metadata: None,
+			slot: Some((base_id, slot_id)),
+		};
+
+		// Add composable resource to NFT
+		assert_ok!(RMRKCore::add_composable_resource(
+			Origin::signed(ALICE),
+			COLLECTION_ID_0,
+			NFT_ID_0,
+			composable_resource,
+			resource_id
+		));
+
+		// Values should now exist in EquippableBases and EquippableSlots
+		assert!(EquippableBases::<Test>::get((COLLECTION_ID_0,NFT_ID_0, base_id)).is_some());
+		assert!(EquippableSlots::<Test>::get((COLLECTION_ID_0,NFT_ID_0, resource_id, base_id, slot_id)).is_some());
+		
+		// Remove resource
+		assert_ok!(RMRKCore::remove_resource(
+			Origin::signed(ALICE),
+			COLLECTION_ID_0,
+			NFT_ID_0,
+			resource_id, 
+		));
+
+		assert!(EquippableBases::<Test>::get((COLLECTION_ID_0,NFT_ID_0, base_id)).is_none());
+		assert!(EquippableSlots::<Test>::get((COLLECTION_ID_0,NFT_ID_0, resource_id, base_id, slot_id)).is_none());
+
 	});
 }