Remove TakeFirstAssetTrader from AH Westend and Rococo

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/mod.rs

@@ -42,8 +42,8 @@ macro_rules! foreign_balance_on {
 }
 
 #[macro_export]
-macro_rules! create_pool_with_wnd_on {
-	( $chain:ident, $asset_id:expr, $is_foreign:expr, $asset_owner:expr ) => {
+macro_rules! create_pool_with_wnd_on_custom_amounts {
+	( $chain:ident, $asset_id:expr, $is_foreign:expr, $asset_owner:expr, $wnd_amount:expr, $asset_amount:expr ) => {
 		emulated_integration_tests_common::impls::paste::paste! {
 			<$chain>::execute_with(|| {
 				type RuntimeEvent = <$chain as Chain>::RuntimeEvent;
@@ -87,8 +87,8 @@ macro_rules! create_pool_with_wnd_on {
 					signed_owner,
 					Box::new(wnd_location),
 					Box::new($asset_id),
-					1_000_000_000_000,
-					2_000_000_000_000, // $asset_id is worth half of wnd
+					$wnd_amount,
+					$asset_amount,
 					0,
 					0,
 					owner.into()
@@ -104,3 +104,17 @@ macro_rules! create_pool_with_wnd_on {
 		}
 	};
 }
+
+#[macro_export]
+macro_rules! create_pool_with_wnd_on {
+	( $chain:ident, $asset_id:expr, $is_foreign:expr, $asset_owner:expr ) => {
+		$crate::create_pool_with_wnd_on_custom_amounts!(
+			$chain,
+			$asset_id,
+			$is_foreign,
+			$asset_owner,
+			1_000_000_000_000,
+			2_000_000_000_000
+		);
+	};
+}

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/transact.rs

@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{create_pool_with_wnd_on, foreign_balance_on, imports::*};
+use crate::{
+	create_pool_with_wnd_on, create_pool_with_wnd_on_custom_amounts, foreign_balance_on, imports::*,
+};
 use frame_support::traits::tokens::fungibles::Mutate;
 use xcm_builder::{DescribeAllTerminal, DescribeFamily, HashedDescription};
 use xcm_executor::traits::ConvertLocation;
@@ -113,7 +115,14 @@ fn transact_from_para_to_para_through_asset_hub() {
 
 	// We create a pool between WND and USDT in AssetHub.
 	let usdt = Location::new(0, [PalletInstance(ASSETS_PALLET_ID), GeneralIndex(USDT_ID.into())]);
-	create_pool_with_wnd_on!(AssetHubWestend, usdt, false, AssetHubWestendSender::get());
+	create_pool_with_wnd_on_custom_amounts!(
+		AssetHubWestend,
+		usdt,
+		false,
+		AssetHubWestendSender::get(),
+		1_000_000_000_000,
+		20_000_000_000
+	);
 	// We also need a pool between WND and USDT on PenpalA.
 	create_pool_with_wnd_on!(PenpalA, PenpalUsdtFromAssetHub::get(), true, PenpalAssetOwner::get());
 	// We also need a pool between WND and USDT on PenpalB.

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs

@@ -405,32 +405,6 @@ impl xcm_executor::Config for XcmConfig {
 			ResolveAssetTo<StakingPot, crate::NativeAndNonPoolAssets>,
 			AccountId,
 		>,
-		// This trader allows to pay with `is_sufficient=true` "Trust Backed" assets from dedicated
-		// `pallet_assets` instance - `Assets`.
-		cumulus_primitives_utility::TakeFirstAssetTrader<
-			AccountId,
-			AssetFeeAsExistentialDepositMultiplierFeeCharger,
-			TrustBackedAssetsConvertedConcreteId,
-			Assets,
-			cumulus_primitives_utility::XcmFeesTo32ByteAccount<
-				FungiblesTransactor,
-				AccountId,
-				XcmAssetFeesReceiver,
-			>,
-		>,
-		// This trader allows to pay with `is_sufficient=true` "Foreign" assets from dedicated
-		// `pallet_assets` instance - `ForeignAssets`.
-		cumulus_primitives_utility::TakeFirstAssetTrader<
-			AccountId,
-			ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger,
-			ForeignAssetsConvertedConcreteId,
-			ForeignAssets,
-			cumulus_primitives_utility::XcmFeesTo32ByteAccount<
-				ForeignFungiblesTransactor,
-				AccountId,
-				XcmAssetFeesReceiver,
-			>,
-		>,
 	);
 	type ResponseHandler = PolkadotXcm;
 	type AssetTrap = PolkadotXcm;

cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs

@@ -426,32 +426,6 @@ impl xcm_executor::Config for XcmConfig {
 			ResolveAssetTo<StakingPot, crate::NativeAndNonPoolAssets>,
 			AccountId,
 		>,
-		// This trader allows to pay with `is_sufficient=true` "Trust Backed" assets from dedicated
-		// `pallet_assets` instance - `Assets`.
-		cumulus_primitives_utility::TakeFirstAssetTrader<
-			AccountId,
-			AssetFeeAsExistentialDepositMultiplierFeeCharger,
-			TrustBackedAssetsConvertedConcreteId,
-			Assets,
-			cumulus_primitives_utility::XcmFeesTo32ByteAccount<
-				FungiblesTransactor,
-				AccountId,
-				XcmAssetFeesReceiver,
-			>,
-		>,
-		// This trader allows to pay with `is_sufficient=true` "Foreign" assets from dedicated
-		// `pallet_assets` instance - `ForeignAssets`.
-		cumulus_primitives_utility::TakeFirstAssetTrader<
-			AccountId,
-			ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger,
-			ForeignAssetsConvertedConcreteId,
-			ForeignAssets,
-			cumulus_primitives_utility::XcmFeesTo32ByteAccount<
-				ForeignFungiblesTransactor,
-				AccountId,
-				XcmAssetFeesReceiver,
-			>,
-		>,
 	);
 	type ResponseHandler = PolkadotXcm;
 	type AssetTrap = PolkadotXcm;

prdoc/pr_8376.prdoc

@@ -0,0 +1,12 @@
+title: 'Stopped using TakeFirstAssetTrader in AH Rococo & Westend'
+doc:
+- audience: Runtime Dev
+  description: |-
+    Removed `TakeFirstAssetTrader` from configs. Improved macro, fixed test.
+crates:
+- name: asset-hub-rococo-runtime
+  bump: minor
+- name: asset-hub-westend-runtime
+  bump: minor
+- name: asset-hub-westend-integration-tests
+  bump: minor