From 33046b6e32e46e4367fafc90a926715a0a41f6ab Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Fri, 18 Aug 2023 13:55:02 +0200 Subject: [PATCH] xcm-emulator mini fix (#3031) --- .../asset-hub-kusama/src/tests/hrmp_channels.rs | 4 ++++ .../assets/asset-hub-kusama/src/tests/send.rs | 2 +- .../asset-hub-polkadot/src/tests/hrmp_channels.rs | 4 ++++ .../assets/asset-hub-polkadot/src/tests/send.rs | 2 +- .../assets/asset-hub-westend/src/tests/send.rs | 2 +- .../integration-tests/emulated/common/src/lib.rs | 11 +++++++++++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs index 9d0bd50502e9..82880fc50d19 100644 --- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs +++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/hrmp_channels.rs @@ -53,6 +53,8 @@ fn open_hrmp_channel_between_paras_works() { bx!(relay_destination.clone()), bx!(xcm), )); + + PenpalKusamaA::assert_xcm_pallet_sent(); }); Kusama::execute_with(|| { @@ -103,6 +105,8 @@ fn open_hrmp_channel_between_paras_works() { bx!(relay_destination), bx!(xcm), )); + + PenpalKusamaB::assert_xcm_pallet_sent(); }); Kusama::execute_with(|| { diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs index 8b92447f11ff..a15ef6c7452c 100644 --- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs +++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/send.rs @@ -171,7 +171,7 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() { bx!(xcm), )); - AssetHubKusama::assert_xcm_pallet_sent(); + PenpalKusamaA::assert_xcm_pallet_sent(); }); AssetHubKusama::execute_with(|| { diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs index e0cb340ddaa6..3e5cbfb61374 100644 --- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs +++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/hrmp_channels.rs @@ -53,6 +53,8 @@ fn open_hrmp_channel_between_paras_works() { bx!(relay_destination.clone()), bx!(xcm), )); + + PenpalPolkadotA::assert_xcm_pallet_sent(); }); Polkadot::execute_with(|| { @@ -103,6 +105,8 @@ fn open_hrmp_channel_between_paras_works() { bx!(relay_destination), bx!(xcm), )); + + PenpalPolkadotB::assert_xcm_pallet_sent(); }); Polkadot::execute_with(|| { diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs index ef34d1b4337d..715adec20b8e 100644 --- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs +++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/send.rs @@ -174,7 +174,7 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() { bx!(xcm), )); - AssetHubPolkadot::assert_xcm_pallet_sent(); + PenpalPolkadotA::assert_xcm_pallet_sent(); }); AssetHubPolkadot::execute_with(|| { diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs index 24301fe1c7d2..527b1eb751fd 100644 --- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs +++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs @@ -113,7 +113,7 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() { bx!(xcm), )); - AssetHubWestend::assert_xcm_pallet_sent(); + PenpalWestendA::assert_xcm_pallet_sent(); }); AssetHubWestend::execute_with(|| { diff --git a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs index 7ef57027c459..55cfdb109017 100644 --- a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs +++ b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs @@ -480,6 +480,17 @@ impl_accounts_helpers_for_parachain!(AssetHubWestend); impl_assets_helpers_for_parachain!(AssetHubWestend, Westend); impl_assert_events_helpers_for_parachain!(AssetHubWestend); +// PenpalPolkadot implementations +impl_assert_events_helpers_for_parachain!(PenpalPolkadotA); +impl_assert_events_helpers_for_parachain!(PenpalPolkadotB); + +// PenpalKusama implementations +impl_assert_events_helpers_for_parachain!(PenpalKusamaA); +impl_assert_events_helpers_for_parachain!(PenpalKusamaB); + +// PenpalWestendA implementation +impl_assert_events_helpers_for_parachain!(PenpalWestendA); + // Collectives implementation impl_accounts_helpers_for_parachain!(Collectives); impl_assert_events_helpers_for_parachain!(Collectives);