Backport patch for xcm fungible benchmarks required by new FungibleAd…

…apter for 1.6 (#3422)

More info here: #3417

Expected patch for  `pallet-xcm-benchmarks` as `7.0.4`

polkadot/xcm/pallet-xcm-benchmarks/src/fungible/benchmarking.rs

@@ -71,6 +71,9 @@ benchmarks_instance_pallet! {
 		let dest_account = T::AccountIdConverter::convert_location(&dest_location).unwrap();
 
 		<AssetTransactorOf<T>>::deposit_asset(&asset, &sender_location, None).unwrap();
+		// We deposit the asset twice so we have enough for ED after transferring
+		<AssetTransactorOf<T>>::deposit_asset(&asset, &sender_location, None).unwrap();
+		let sender_account_balance_before = T::TransactAsset::balance(&sender_account);
 		assert!(T::TransactAsset::balance(&dest_account).is_zero());
 
 		let mut executor = new_executor::<T>(sender_location);
@@ -79,7 +82,7 @@ benchmarks_instance_pallet! {
 	}: {
 		executor.bench_process(xcm)?;
 	} verify {
-		assert!(T::TransactAsset::balance(&sender_account).is_zero());
+		assert!(T::TransactAsset::balance(&sender_account) < sender_account_balance_before);
 		assert!(!T::TransactAsset::balance(&dest_account).is_zero());
 	}
 
@@ -93,12 +96,13 @@ benchmarks_instance_pallet! {
 			&dest_location,
 			FeeReason::TransferReserveAsset
 		);
-		let sender_account_balance_before = T::TransactAsset::balance(&sender_account);
 
 		let asset = T::get_multi_asset();
 		<AssetTransactorOf<T>>::deposit_asset(&asset, &sender_location, None).unwrap();
-		assert!(T::TransactAsset::balance(&sender_account) > sender_account_balance_before);
-		let assets: MultiAssets = vec![ asset ].into();
+		// We deposit the asset twice so we have enough for ED after transferring
+		<AssetTransactorOf<T>>::deposit_asset(&asset, &sender_location, None).unwrap();
+		let sender_account_balance_before = T::TransactAsset::balance(&sender_account);
+		let assets: MultiAssets = vec![asset].into();
 		assert!(T::TransactAsset::balance(&dest_account).is_zero());
 
 		let mut executor = new_executor::<T>(sender_location);

polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs

@@ -103,8 +103,7 @@ impl xcm_executor::traits::MatchesFungible<u64> for MatchAnyFungible {
 }
 
 // Use balances as the asset transactor.
-#[allow(deprecated)]
-pub type AssetTransactor = xcm_builder::CurrencyAdapter<
+pub type AssetTransactor = xcm_builder::FungibleAdapter<
 	Balances,
 	MatchAnyFungible,
 	AccountIdConverter,
@@ -193,8 +192,7 @@ impl xcm_balances_benchmark::Config for Test {
 	type TrustedReserve = TrustedReserve;
 
 	fn get_multi_asset() -> MultiAsset {
-		let amount =
-			<Balances as frame_support::traits::fungible::Inspect<u64>>::minimum_balance() as u128;
+		let amount = 1_000_000_000_000;
 		MultiAsset { id: Concrete(Here.into()), fun: Fungible(amount) }
 	}
 }