test: pallet api fungibles

pallets/api/src/fungibles/mod.rs

@@ -14,16 +14,13 @@ mod tests;
 pub mod weights;
 
 type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
-type TokenIdOf<T> = <pallet_assets::Pallet<T, AssetsInstanceOf<T>> as Inspect<
-	<T as frame_system::Config>::AccountId,
->>::AssetId;
+type TokenIdOf<T> = <AssetsOf<T> as Inspect<<T as frame_system::Config>::AccountId>>::AssetId;
 type TokenIdParameterOf<T> = <T as pallet_assets::Config<AssetsInstanceOf<T>>>::AssetIdParameter;
 type AssetsOf<T> = pallet_assets::Pallet<T, AssetsInstanceOf<T>>;
 type AssetsInstanceOf<T> = <T as Config>::AssetsInstance;
 type AssetsWeightInfoOf<T> = <T as pallet_assets::Config<AssetsInstanceOf<T>>>::WeightInfo;
-type BalanceOf<T> = <pallet_assets::Pallet<T, AssetsInstanceOf<T>> as Inspect<
-	<T as frame_system::Config>::AccountId,
->>::Balance;
+type BalanceOf<T> = <AssetsOf<T> as Inspect<<T as frame_system::Config>::AccountId>>::Balance;
+type WeightOf<T> = <T as Config>::WeightInfo;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -79,7 +76,7 @@ pub mod pallet {
 		/// Decimals for the specified token.
 		#[codec(index = 10)]
 		TokenDecimals(TokenIdOf<T>),
-		/// Check if a specified token exists.
+		/// Whether a specified token exists.
 		#[codec(index = 18)]
 		TokenExists(TokenIdOf<T>),
 	}
@@ -125,7 +122,7 @@ pub mod pallet {
 	pub trait Config: frame_system::Config + pallet_assets::Config<Self::AssetsInstance> {
 		/// Because this pallet emits events, it depends on the runtime's definition of an event.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-		/// The instance of pallet assets it is tightly coupled to.
+		/// The instance of pallet-assets.
 		type AssetsInstance;
 		/// Weight information for dispatchables in this pallet.
 		type WeightInfo: WeightInfo;
@@ -160,7 +157,7 @@ pub mod pallet {
 			/// The amount transferred (or minted/burned).
 			value: BalanceOf<T>,
 		},
-		/// Event emitted when an token is created.
+		/// Event emitted when a token is created.
 		Create {
 			/// The token identifier.
 			id: TokenIdOf<T>,
@@ -241,12 +238,12 @@ pub mod pallet {
 			value: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let owner = ensure_signed(origin.clone())
-				.map_err(|e| e.with_weight(Self::weight_approve(0, 0)))?;
+				.map_err(|e| e.with_weight(WeightOf::<T>::approve(0, 0)))?;
 			let current_allowance = AssetsOf::<T>::allowance(token.clone(), &owner, &spender);
 
 			let weight = match value.cmp(&current_allowance) {
 				// If the new value is equal to the current allowance, do nothing.
-				Equal => Self::weight_approve(0, 0),
+				Equal => WeightOf::<T>::approve(0, 0),
 				// If the new value is greater than the current allowance, approve the difference
 				// because `approve_transfer` works additively (see `pallet-assets`).
 				Greater => {
@@ -256,8 +253,8 @@ pub mod pallet {
 						T::Lookup::unlookup(spender.clone()),
 						value.saturating_sub(current_allowance),
 					)
-					.map_err(|e| e.with_weight(Self::weight_approve(1, 0)))?;
-					Self::weight_approve(1, 0)
+					.map_err(|e| e.with_weight(WeightOf::<T>::approve(1, 0)))?;
+					WeightOf::<T>::approve(1, 0)
 				},
 				// If the new value is less than the current allowance, cancel the approval and
 				// set the new value.
@@ -269,17 +266,17 @@ pub mod pallet {
 						token_param.clone(),
 						spender_source.clone(),
 					)
-					.map_err(|e| e.with_weight(Self::weight_approve(0, 1)))?;
+					.map_err(|e| e.with_weight(WeightOf::<T>::approve(0, 1)))?;
 					if value.is_zero() {
-						Self::weight_approve(0, 1)
+						WeightOf::<T>::approve(0, 1)
 					} else {
 						AssetsOf::<T>::approve_transfer(
 							origin,
 							token_param,
 							spender_source,
 							value,
 						)?;
-						Self::weight_approve(1, 1)
+						WeightOf::<T>::approve(1, 1)
 					}
 				},
 			};
@@ -302,7 +299,7 @@ pub mod pallet {
 			value: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let owner = ensure_signed(origin.clone())
-				.map_err(|e| e.with_weight(Self::weight_approve(0, 0)))?;
+				.map_err(|e| e.with_weight(WeightOf::<T>::approve(0, 0)))?;
 			AssetsOf::<T>::approve_transfer(
 				origin,
 				token.clone().into(),
@@ -330,32 +327,32 @@ pub mod pallet {
 			value: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			let owner = ensure_signed(origin.clone())
-				.map_err(|e| e.with_weight(Self::weight_approve(0, 0)))?;
+				.map_err(|e| e.with_weight(WeightOf::<T>::approve(0, 0)))?;
 			if value.is_zero() {
-				return Ok(Some(Self::weight_approve(0, 0)).into());
+				return Ok(Some(WeightOf::<T>::approve(0, 0)).into());
 			}
 			let current_allowance = AssetsOf::<T>::allowance(token.clone(), &owner, &spender);
 			let spender_source = T::Lookup::unlookup(spender.clone());
 			let token_param: TokenIdParameterOf<T> = token.clone().into();
 
-			// Cancel the approval and set the new value if `new_allowance` is more than zero.
+			// Cancel the approval and approve `new_allowance` if difference is more than zero.
 			AssetsOf::<T>::cancel_approval(
 				origin.clone(),
 				token_param.clone(),
 				spender_source.clone(),
 			)
-			.map_err(|e| e.with_weight(Self::weight_approve(0, 1)))?;
+			.map_err(|e| e.with_weight(WeightOf::<T>::approve(0, 1)))?;
 			let new_allowance = current_allowance.saturating_sub(value);
 			let weight = if new_allowance.is_zero() {
-				Self::weight_approve(0, 1)
+				WeightOf::<T>::approve(0, 1)
 			} else {
 				AssetsOf::<T>::approve_transfer(
 					origin,
 					token_param,
 					spender_source,
 					new_allowance,
 				)?;
-				Self::weight_approve(1, 1)
+				WeightOf::<T>::approve(1, 1)
 			};
 			Self::deposit_event(Event::Approval { token, owner, spender, value: new_allowance });
 			Ok(Some(weight).into())
@@ -390,6 +387,10 @@ pub mod pallet {
 		///
 		/// # Parameters
 		/// - `token` - The token to be destroyed.
+		// See `pallet-assets` documentation for more information. Related dispatchables are:
+		// - `destroy_accounts`
+		// - `destroy_approvals`
+		// - `finish_destroy`
 		#[pallet::call_index(12)]
 		#[pallet::weight(AssetsWeightInfoOf::<T>::start_destroy())]
 		pub fn start_destroy(origin: OriginFor<T>, token: TokenIdOf<T>) -> DispatchResult {
@@ -475,12 +476,6 @@ pub mod pallet {
 		}
 	}
 
-	impl<T: Config> Pallet<T> {
-		fn weight_approve(approve: u32, cancel: u32) -> Weight {
-			<T as Config>::WeightInfo::approve(cancel, approve)
-		}
-	}
-
 	impl<T: Config> crate::Read for Pallet<T> {
 		/// The type of read requested.
 		type Read = Read<T>;