feat: add pallet-api/nonfungibles

pallets/api/src/mock.rs

@@ -2,6 +2,7 @@ use codec::{Decode, Encode};
 use frame_support::{
 	derive_impl, parameter_types,
 	traits::{AsEnsureOriginWithArg, ConstU128, ConstU32, ConstU64, Everything},
+	weights::constants::RocksDbWeight,
 };
 use frame_system::{EnsureRoot, EnsureSigned};
 use pallet_nfts::PalletFeatures;
@@ -51,7 +52,7 @@ impl frame_system::Config for Test {
 	type BlockHashCount = BlockHashCount;
 	type BlockLength = ();
 	type BlockWeights = ();
-	type DbWeight = ();
+	type DbWeight = RocksDbWeight;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type Lookup = IdentityLookup<Self::AccountId>;
@@ -157,7 +158,7 @@ impl pallet_nfts::pallet::BenchmarkHelper<u32, u32, Noop, u64, Noop> for () {
 		unimplemented!()
 	}
 
-	fn sign(signer: &Noop, message: &[u8]) -> Noop {
+	fn sign(_signer: &Noop, _message: &[u8]) -> Noop {
 		unimplemented!()
 	}
 }

pallets/api/src/nonfungibles/benchmarking.rs

@@ -96,9 +96,10 @@ mod benchmarks {
 		#[extrinsic_call]
 		_(origin, collection_id, maybe_item, operator.clone(), approved);
 
-		assert!(
+		assert_eq!(
 			NftsOf::<T>::check_approval_permission(&collection_id, &maybe_item, &owner, &operator)
-				.is_ok() == approved
+				.is_ok(),
+			approved
 		);
 
 		if approved {
@@ -182,7 +183,7 @@ mod benchmarks {
 			Pallet::<T>::read(Read::GetAttribute {
 				key: BoundedVec::default(),
 				collection: CollectionIdOf::<T>::zero(),
-				item: ItemIdOf::<T>::zero(),
+				item: Some(ItemIdOf::<T>::zero()),
 				namespace: AttributeNamespace::CollectionOwner,
 			});
 		}

pallets/api/src/nonfungibles/impls.rs

@@ -1,72 +1,50 @@
-use frame_support::dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo};
+use frame_support::dispatch::DispatchResult;
 use frame_system::pallet_prelude::*;
-use sp_runtime::traits::StaticLookup;
 
-use super::{pallet::*, AccountIdOf, CollectionIdOf, ItemIdOf, NftsOf, WeightInfo};
+use super::{pallet::*, AccountIdLookupOf, CollectionIdOf, ItemIdOf, NftsOf};
 
 impl<T: Config> Pallet<T> {
-	/// Approves the transfer of a specific item or all collection items owned by the `owner` to an
-	/// `operator`.
+	// Approves the transfer of a specific item or all collection items owned by the `owner` to an
+	// `operator`.
 	///
-	/// # Parameters
-	/// - `owner` - The owner of the specified collection item(s).
-	/// - `collection` - The identifier of the collection.
-	/// - `maybe_item` - The optional item of the collection to be approved for delegated transfer.
-	///   If `None`, the approval applies to all `owner`'s collection items.
-	/// - `operator` - The account to delegate permission to transfer a specified collection item or
-	///   all collection items owned by the `owner`.
+	// # Parameters
+	// - `owner` - The owner of the specified collection item(s).
+	// - `collection` - The collection identifier.
+	// - `maybe_item` - The optional item of the collection to be approved for delegated transfer.
+	//   If `None`, the approval applies to all `owner`'s collection items.
+	// - `operator` - The account to delegate permission to.
 	pub(crate) fn do_approve(
 		owner: OriginFor<T>,
 		collection: CollectionIdOf<T>,
 		maybe_item: Option<ItemIdOf<T>>,
-		operator: &AccountIdOf<T>,
-	) -> DispatchResultWithPostInfo {
-		let operator = T::Lookup::unlookup(operator.clone());
-		Ok(Some(match maybe_item {
-			Some(item) => {
-				NftsOf::<T>::approve_transfer(owner, collection, item, operator, None)
-					.map_err(|e| e.with_weight(<T as Config>::WeightInfo::approve(1, 1)))?;
-				<T as Config>::WeightInfo::approve(1, 1)
-			},
-			None => {
-				NftsOf::<T>::approve_collection_transfer(owner, collection, operator, None)
-					.map_err(|e| e.with_weight(<T as Config>::WeightInfo::approve(1, 0)))?;
-				<T as Config>::WeightInfo::approve(1, 0)
-			},
-		})
-		.into())
+		operator: AccountIdLookupOf<T>,
+	) -> DispatchResult {
+		match maybe_item {
+			Some(item) => NftsOf::<T>::approve_transfer(owner, collection, item, operator, None),
+			None => NftsOf::<T>::approve_collection_transfer(owner, collection, operator, None),
+		}
 	}
 
-	/// Cancel an approval to transfer a specific item or all items within a collection owned by
-	/// the `owner`.
+	// Cancel an approval to transfer a specific item or all items within a collection owned by
+	// the `owner`.
 	///
-	/// # Parameters
-	/// - `owner` - The owner of the specified collection item(s).
-	/// - `collection` - The identifier of the collection.
-	/// - `maybe_item` - The optional item of the collection that the operator has an approval to
-	///   transfer. If not provided, an approval to transfer all `owner`'s collection items will be
-	///   cancelled.
-	/// - `operator` - The account that had permission to transfer a specified collection item or
-	///   all collection items owned by the `owner`.
+	// # Parameters
+	// - `owner` - The owner of the specified collection item(s).
+	// - `collection` - The collection identifier.
+	// - `maybe_item` - The optional item of the collection that the operator has an approval to
+	//   transfer. If not provided, an approval to transfer all `owner`'s collection items will be
+	//   cancelled.
+	// - `operator` - The account that had permission to transfer a specified collection item or all
+	//   collection items owned by the `owner`.
 	pub(crate) fn do_cancel_approval(
 		owner: OriginFor<T>,
 		collection: CollectionIdOf<T>,
 		maybe_item: Option<ItemIdOf<T>>,
-		operator: &AccountIdOf<T>,
-	) -> DispatchResultWithPostInfo {
-		let operator = T::Lookup::unlookup(operator.clone());
-		Ok(Some(match maybe_item {
-			Some(item) => {
-				NftsOf::<T>::cancel_approval(owner, collection, item, operator)
-					.map_err(|e| e.with_weight(<T as Config>::WeightInfo::approve(0, 1)))?;
-				<T as Config>::WeightInfo::approve(0, 1)
-			},
-			None => {
-				NftsOf::<T>::cancel_collection_approval(owner, collection, operator)
-					.map_err(|e| e.with_weight(<T as Config>::WeightInfo::approve(0, 0)))?;
-				<T as Config>::WeightInfo::approve(0, 0)
-			},
-		})
-		.into())
+		operator: AccountIdLookupOf<T>,
+	) -> DispatchResult {
+		match maybe_item {
+			Some(item) => NftsOf::<T>::cancel_approval(owner, collection, item, operator),
+			None => NftsOf::<T>::cancel_collection_approval(owner, collection, operator),
+		}
 	}
 }