Remove TakeFirstAssetTrader from AH Westend and Rococo

cumulus/parachains/integration-tests/emulated/common/src/macros.rs

@@ -827,6 +827,17 @@ macro_rules! test_cross_chain_alias {
 #[macro_export]
 macro_rules! create_pool_with_native_on {
 	( $chain:ident, $asset:expr, $is_foreign:expr, $asset_owner:expr ) => {
+		$crate::create_pool_with_native_on!(
+			$chain,
+			$asset,
+			$is_foreign,
+			$asset_owner,
+			1_000_000_000_000,
+			2_000_000_000_000
+		);
+	};
+
+	( $chain:ident, $asset:expr, $is_foreign:expr, $asset_owner:expr, $native_amount:expr, $asset_amount:expr ) => {
 		emulated_integration_tests_common::impls::paste::paste! {
 			<$chain>::execute_with(|| {
 				type RuntimeEvent = <$chain as Chain>::RuntimeEvent;
@@ -871,8 +882,8 @@ macro_rules! create_pool_with_native_on {
 					signed_owner,
 					Box::new(native_asset),
 					Box::new($asset),
-					1_000_000_000_000,
-					2_000_000_000_000, // $asset is worth half of native_asset
+					$native_amount,
+					$asset_amount,
 					0,
 					0,
 					owner.into()

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

@@ -23,3 +23,80 @@ mod swap;
 mod teleport;
 mod treasury;
 mod xcm_fee_estimation;
+
+#[macro_export]
+macro_rules! create_pool_with_roc_on {
+	// default amounts
+	( $chain:ident, $asset_id:expr, $is_foreign:expr, $asset_owner:expr ) => {
+		$crate::create_pool_with_roc_on!(
+			$chain,
+			$asset_id,
+			$is_foreign,
+			$asset_owner,
+			1_000_000_000_000,
+			2_000_000_000_000
+		);
+	};
+
+	// custom amounts
+	( $chain:ident, $asset_id:expr, $is_foreign:expr, $asset_owner:expr, $roc_amount:expr, $asset_amount:expr ) => {
+		emulated_integration_tests_common::impls::paste::paste! {
+			<$chain>::execute_with(|| {
+				type RuntimeEvent = <$chain as Chain>::RuntimeEvent;
+				let owner = $asset_owner;
+				let signed_owner = <$chain as Chain>::RuntimeOrigin::signed(owner.clone());
+				let roc_location: Location = Parent.into();
+				if $is_foreign {
+					assert_ok!(<$chain as [<$chain Pallet>]>::ForeignAssets::mint(
+						signed_owner.clone(),
+						$asset_id.clone().into(),
+						owner.clone().into(),
+						10_000_000_000_000, // For it to have more than enough.
+					));
+				} else {
+					let asset_id = match $asset_id.interior.last() {
+						Some(GeneralIndex(id)) => *id as u32,
+						_ => unreachable!(),
+					};
+					assert_ok!(<$chain as [<$chain Pallet>]>::Assets::mint(
+						signed_owner.clone(),
+						asset_id.into(),
+						owner.clone().into(),
+						10_000_000_000_000, // For it to have more than enough.
+					));
+				}
+
+				assert_ok!(<$chain as [<$chain Pallet>]>::AssetConversion::create_pool(
+					signed_owner.clone(),
+					Box::new(roc_location.clone()),
+					Box::new($asset_id.clone()),
+				));
+
+				assert_expected_events!(
+					$chain,
+					vec![
+						RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::PoolCreated { .. }) => {},
+					]
+				);
+
+				assert_ok!(<$chain as [<$chain Pallet>]>::AssetConversion::add_liquidity(
+					signed_owner,
+					Box::new(roc_location),
+					Box::new($asset_id),
+					$roc_amount,
+					$asset_amount,
+					0,
+					0,
+					owner.into()
+				));
+
+				assert_expected_events!(
+					$chain,
+					vec![
+						RuntimeEvent::AssetConversion(pallet_asset_conversion::Event::LiquidityAdded { .. }) => {},
+					]
+				);
+			});
+		}
+	};
+}

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/send.rs

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::imports::*;
+use crate::{create_pool_with_roc_on, imports::*};
 
 /// Relay Chain should be able to execute `Transact` instructions in System Parachain
 /// when `OriginKind::Superuser`.
@@ -139,6 +139,8 @@ fn send_xcm_from_para_to_asset_hub_paying_fee_with_sufficient_asset() {
 	let fee_amount = ASSET_MIN_BALANCE * 1000000;
 	let asset =
 		([PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())], fee_amount).into();
+	let asset_location =
+		Location::new(0, [PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())]);
 
 	let root_origin = <PenpalA as Chain>::RuntimeOrigin::root();
 	let system_para_destination = PenpalA::sibling_location_of(AssetHubRococo::para_id()).into();
@@ -150,6 +152,15 @@ fn send_xcm_from_para_to_asset_hub_paying_fee_with_sufficient_asset() {
 		ASSET_HUB_ROCOCO_ED * 10000000000,
 	)]);
 
+	create_pool_with_roc_on!(
+		AssetHubRococo,
+		asset_location,
+		false,
+		para_sovereign_account.clone(),
+		9_000_000_000_000_000,
+		9_000_000_000_000
+	);
+
 	PenpalA::execute_with(|| {
 		assert_ok!(<PenpalA as PenpalAPallet>::PolkadotXcm::send(
 			root_origin,

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

@@ -43,7 +43,20 @@ macro_rules! foreign_balance_on {
 
 #[macro_export]
 macro_rules! create_pool_with_wnd_on {
+	// default amounts
 	( $chain:ident, $asset_id:expr, $is_foreign:expr, $asset_owner:expr ) => {
+		$crate::create_pool_with_wnd_on!(
+			$chain,
+			$asset_id,
+			$is_foreign,
+			$asset_owner,
+			1_000_000_000_000,
+			2_000_000_000_000
+		);
+	};
+
+	// 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 +100,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()

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

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::imports::*;
+use crate::{create_pool_with_wnd_on, imports::*};
 
 /// Relay Chain should be able to execute `Transact` instructions in System Parachain
 /// when `OriginKind::Superuser`.
@@ -139,6 +139,8 @@ fn send_xcm_from_para_to_asset_hub_paying_fee_with_sufficient_asset() {
 	let fee_amount = ASSET_MIN_BALANCE * 1000000;
 	let asset =
 		([PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())], fee_amount).into();
+	let asset_location =
+		Location::new(0, [PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())]);
 
 	let root_origin = <PenpalA as Chain>::RuntimeOrigin::root();
 	let system_para_destination = PenpalA::sibling_location_of(AssetHubWestend::para_id()).into();
@@ -150,6 +152,15 @@ fn send_xcm_from_para_to_asset_hub_paying_fee_with_sufficient_asset() {
 		ASSET_HUB_WESTEND_ED * 10000000000,
 	)]);
 
+	create_pool_with_wnd_on!(
+		AssetHubWestend,
+		asset_location,
+		false,
+		para_sovereign_account.clone(),
+		9_000_000_000_000_000,
+		9_000_000_000_000
+	);
+
 	PenpalA::execute_with(|| {
 		assert_ok!(<PenpalA as PenpalAPallet>::PolkadotXcm::send(
 			root_origin,

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

@@ -113,7 +113,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!(
+		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/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/asset_transfers.rs

@@ -363,6 +363,7 @@ fn send_rocs_from_penpal_rococo_through_asset_hub_rococo_to_asset_hub_westend()
 	let local_asset_hub = PenpalA::sibling_location_of(AssetHubRococo::para_id());
 	let (roc_at_rococo_parachains, roc_at_asset_hub_westend) =
 		set_up_rocs_for_penpal_rococo_through_ahr_to_ahw(&sender, amount);
+	set_up_pool_with_wnd_on_ah_westend(roc_at_asset_hub_westend.clone(), true);
 
 	let sov_ahw_on_ahr = AssetHubRococo::sovereign_account_of_parachain_on_other_global_consensus(
 		ByGenesis(WESTEND_GENESIS_HASH),

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge_common.rs

@@ -322,8 +322,22 @@ pub fn create_pools_on_ah() {
 	let ethereum_sovereign = snowbridge_sovereign();
 	AssetHubWestend::fund_accounts(vec![(ethereum_sovereign.clone(), INITIAL_FUND)]);
 	PenpalB::fund_accounts(vec![(ethereum_sovereign.clone(), INITIAL_FUND)]);
-	create_pool_with_native_on!(AssetHubWestend, weth_location(), true, ethereum_sovereign.clone());
-	create_pool_with_native_on!(AssetHubWestend, ethereum(), true, ethereum_sovereign.clone());
+	create_pool_with_native_on!(
+		AssetHubWestend,
+		weth_location(),
+		true,
+		ethereum_sovereign.clone(),
+		1_000_000_000_000,
+		20_000_000_000
+	);
+	create_pool_with_native_on!(
+		AssetHubWestend,
+		ethereum(),
+		true,
+		ethereum_sovereign.clone(),
+		1_000_000_000_000,
+		20_000_000_000
+	);
 }
 
 pub(crate) fn set_up_eth_and_dot_pool() {

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge_v2_inbound.rs

@@ -161,6 +161,7 @@ fn send_token_v2() {
 		NativeTokenERC20 { token_id: token.into(), value: token_transfer_value },
 	];
 
+	set_up_eth_and_dot_pool();
 	let topic_id = BridgeHubWestend::execute_with(|| {
 		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
 		let instructions = vec![
@@ -280,6 +281,7 @@ fn send_weth_v2() {
 		NativeTokenERC20 { token_id: WETH.into(), value: token_transfer_value },
 	];
 
+	set_up_eth_and_dot_pool();
 	BridgeHubWestend::execute_with(|| {
 		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
 		let instructions = vec![
@@ -769,6 +771,7 @@ fn send_foreign_erc20_token_back_to_polkadot() {
 	.appended_with(asset_id.clone().interior)
 	.unwrap();
 
+	set_up_eth_and_dot_pool();
 	// Register token
 	BridgeHubWestend::execute_with(|| {
 		type RuntimeOrigin = <BridgeHubWestend as Chain>::RuntimeOrigin;
@@ -963,6 +966,7 @@ fn invalid_claimer_does_not_fail_the_message() {
 
 	let origin = H160::random();
 
+	set_up_eth_and_dot_pool();
 	BridgeHubWestend::execute_with(|| {
 		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
 		let instructions = vec![

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/transact.rs

@@ -138,9 +138,23 @@ fn transact_from_ethereum_to_penpalb_through_asset_hub() {
 
 	// We create a pool between WND and WETH in AssetHub to support paying for fees with WETH.
 	let snowbridge_sovereign = snowbridge_sovereign();
-	create_pool_with_native_on!(AssetHubWestend, bridged_weth.clone(), true, snowbridge_sovereign);
+	create_pool_with_native_on!(
+		AssetHubWestend,
+		bridged_weth.clone(),
+		true,
+		snowbridge_sovereign,
+		1_000_000_000_000,
+		20_000_000_000
+	);
 	// We also need a pool between WND and WETH on PenpalB to support paying for fees with WETH.
-	create_pool_with_native_on!(PenpalB, bridged_weth.clone(), true, PenpalAssetOwner::get());
+	create_pool_with_native_on!(
+		PenpalB,
+		bridged_weth.clone(),
+		true,
+		PenpalAssetOwner::get(),
+		1_000_000_000_000,
+		20_000_000_000
+	);
 
 	// Init values for Parachain Destination
 	let receiver = PenpalBReceiver::get();