Merge branch 'daan/feat-api_fungibles_pallet' into chungquantin/feat-…

…transfer-decrease

Cargo.toml

@@ -56,7 +56,7 @@ pallet-api = { path = "pallets/api", default-features = false }
 pop-runtime-devnet = { path = "runtime/devnet", default-features = true } # default-features=true required for `-p pop-node` builds
 pop-runtime-testnet = { path = "runtime/testnet", default-features = true } # default-features=true required for `-p pop-node` builds
 pop-runtime-common = { path = "runtime/common", default-features = false }
-primitives = { path = "./primitives", default-features = false }
+pop-primitives = { path = "./primitives", default-features = false }
 
 # Substrate
 sc-basic-authorship = "0.35.0"

node/src/command.rs

@@ -64,18 +64,9 @@ impl RuntimeResolver for PathBuf {
 
 fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 	Ok(match id {
-		#[cfg(not(feature = "paseo"))]
-		"dev-rococo" => Box::new(chain_spec::development_config(Relay::RococoLocal)),
-		#[cfg(feature = "paseo")]
-		"dev-paseo" => Box::new(chain_spec::development_config(Relay::PaseoLocal)),
-		#[cfg(not(feature = "paseo"))]
-		"pop-rococo" => Box::new(chain_spec::testnet_config(Relay::Rococo)),
-		#[cfg(feature = "paseo")]
-		"pop-paseo" => Box::new(chain_spec::testnet_config(Relay::Paseo)),
-		#[cfg(feature = "paseo")]
+		"dev" | "dev-paseo" => Box::new(chain_spec::development_config(Relay::PaseoLocal)),
+		"test" | "pop-paseo" => Box::new(chain_spec::testnet_config(Relay::Paseo)),
 		"" | "local" => Box::new(chain_spec::development_config(Relay::PaseoLocal)),
-		#[cfg(not(feature = "paseo"))]
-		"" | "local" => Box::new(chain_spec::development_config(Relay::RococoLocal)),
 		path => {
 			let path: PathBuf = path.into();
 			match path.runtime() {

pallets/api/Cargo.toml

@@ -18,7 +18,6 @@ frame-benchmarking.workspace = true
 frame-support.workspace = true
 frame-system.workspace = true
 pallet-assets.workspace = true
-primitives.workspace = true
 sp-runtime.workspace = true
 sp-std.workspace = true
 
@@ -43,7 +42,6 @@ std = [
     "frame-system/std",
     "pallet-assets/std",
     "pallet-balances/std",
-    "primitives/std",
     "scale-info/std",
     "sp-core/std",
     "sp-io/std",

pallets/api/src/fungibles/benchmarking.rs

@@ -1,6 +1,6 @@
-//! Benchmarking setup for pallet-cards
+//! Benchmarking setup for pallet-api::fungibles
 
-use super::{AccountIdOf, AssetIdOf, Assets, AssetsInstanceOf, BalanceOf, Call, Config, Pallet};
+use super::{AccountIdOf, AssetIdOf, AssetsInstanceOf, AssetsOf, BalanceOf, Call, Config, Pallet};
 use frame_benchmarking::{account, v2::*};
 use frame_support::{
 	assert_ok,
@@ -17,42 +17,88 @@ use sp_runtime::traits::Zero;
 
 const SEED: u32 = 1;
 
+// See if `generic_event` has been emitted.
+fn assert_has_event<T: Config>(
+	generic_event: <T as pallet_assets::Config<AssetsInstanceOf<T>>>::RuntimeEvent,
+) {
+	frame_system::Pallet::<T>::assert_has_event(generic_event.into());
+}
+
 #[benchmarks(
 	where
 	<pallet_assets::Pallet<T, AssetsInstanceOf<T>> as Inspect<<T as frame_system::Config>::AccountId>>::AssetId: Zero,
 )]
 mod benchmarks {
 	use super::*;
 
-	// The worst case scenario is when the allowance is set to a value which is lower than the
-	// current allowance.
+	// Parameter:
+	// - 'a': whether `approve_transfer` is required.
+	// - 'c': whether `cancel_approval` is required.
 	#[benchmark]
-	fn approve() -> Result<(), BenchmarkError> {
-		let asset = AssetIdOf::<T>::zero();
-		let decreased_value = <BalanceOf<T>>::from(50u32);
+	fn approve(a: Linear<0, 1>, c: Linear<0, 1>) -> Result<(), BenchmarkError> {
+		let asset_id = AssetIdOf::<T>::zero();
 		let min_balance = <BalanceOf<T>>::from(1u32);
 		let owner: AccountIdOf<T> = account("Alice", 0, SEED);
 		let spender: AccountIdOf<T> = account("Bob", 0, SEED);
-		let value = <BalanceOf<T>>::from(100u32);
-		T::Currency::make_free_balance_be(&owner, 100u32.into());
-		assert_ok!(<Assets<T> as Create<AccountIdOf<T>>>::create(
-			asset.clone().into(),
+		let current_allowance = <BalanceOf<T>>::from(u32::MAX / 2);
+		T::Currency::make_free_balance_be(&owner, u32::MAX.into());
+		// Set the `current_allowance`.
+		assert_ok!(<AssetsOf<T> as Create<AccountIdOf<T>>>::create(
+			asset_id.clone(),
 			owner.clone(),
 			true,
 			min_balance
 		));
-		assert_ok!(<Assets<T> as Mutate<AccountIdOf<T>>>::approve(
-			asset.clone(),
+		assert_ok!(<AssetsOf<T> as Mutate<AccountIdOf<T>>>::approve(
+			asset_id.clone(),
 			&owner,
 			&spender,
-			value
+			current_allowance,
 		));
+		let approval_value = match (a, c) {
+			// Equal to the current allowance.
+			(0, 0) => current_allowance,
+			// Greater than the current allowance.
+			(1, 0) => <BalanceOf<T>>::from(u32::MAX),
+			// Zero.
+			(0, 1) => <BalanceOf<T>>::from(0u32),
+			// Smaller than the current allowance.
+			(1, 1) => <BalanceOf<T>>::from(u32::MAX / 4),
+			_ => unreachable!("values can only be 0 or 1"),
+		};
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(owner.clone()), asset.clone(), spender.clone(), decreased_value);
-
-		assert_eq!(Assets::<T>::allowance(asset, &owner, &spender), decreased_value);
+		_(RawOrigin::Signed(owner.clone()), asset_id.clone(), spender.clone(), approval_value);
 
+		assert_eq!(AssetsOf::<T>::allowance(asset_id.clone(), &owner, &spender), approval_value);
+		if c == 1 {
+			assert_has_event::<T>(
+				pallet_assets::Event::ApprovalCancelled {
+					asset_id: asset_id.clone(),
+					owner: owner.clone(),
+					delegate: spender.clone(),
+				}
+				.into(),
+			);
+		}
+		if a == 1 {
+			let amount = match c {
+				// When the allowance was cancelled and then approved with the new value.
+				1 => approval_value,
+				// When the allowance was increased.
+				0 => approval_value - current_allowance,
+				_ => unreachable!("`c` can only be 0 or 1"),
+			};
+			assert_has_event::<T>(
+				pallet_assets::Event::ApprovedTransfer {
+					asset_id,
+					source: owner,
+					delegate: spender,
+					amount,
+				}
+				.into(),
+			);
+		}
 		Ok(())
 	}