Salvage #2670

Thanks Kian! Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
paritytech · Jun 6, 2023 · 9d114d4 · 9d114d4
1 parent 5869e14
commit 9d114d4
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 123 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs
@@ -22,8 +22,8 @@ pub use xcm::{
 	v3::{Error, NetworkId::Kusama as KusamaId},
 };
 pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	Parachain as Para, RelayChain as Relay, TestExt,
+	assert_expected_events, bx, helpers::weight_within_threshold, Parachain as Para,
+	RelayChain as Relay, TestExt,
 };
 
 #[cfg(test)]

diff --git a/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs b/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs
@@ -44,15 +44,8 @@ fn reserve_transfer_native_asset_from_relay_to_assets() {
 	AssetHubKusama::execute_with(|| {
 		type RuntimeEvent = <AssetHubKusama as Para>::RuntimeEvent;
 
-		assert_expected_events!(
-			AssetHubKusama,
-			vec![
-				RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-					outcome: Outcome::Incomplete(_, Error::UntrustedReserveLocation),
-					..
-				}) => {},
-			]
-		);
+		// TODO: This used to emit an event at the DmpQueue pallet which is not gone.. does it have a replacement?
+		assert_expected_events!(AssetHubKusama, vec![]);
 	});
 
 	// Check if balances are updated accordingly in Relay Chain and Assets Parachain

diff --git a/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs b/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs
@@ -26,8 +26,8 @@ pub use xcm::{
 	},
 };
 pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	Parachain as Para, RelayChain as Relay, TestExt,
+	assert_expected_events, bx, helpers::weight_within_threshold, Parachain as Para,
+	RelayChain as Relay, TestExt,
 };
 
 #[cfg(test)]

diff --git a/...chains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs b/...chains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs
@@ -44,15 +44,8 @@ fn reserve_transfer_native_asset_from_relay_to_assets() {
 	AssetHubPolkadot::execute_with(|| {
 		type RuntimeEvent = <AssetHubPolkadot as Para>::RuntimeEvent;
 
-		assert_expected_events!(
-			AssetHubPolkadot,
-			vec![
-				RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-					outcome: Outcome::Incomplete(_, Error::UntrustedReserveLocation),
-					..
-				}) => {},
-			]
-		);
+		// TODO: This used to emit an event at the DmpQueue pallet which is not gone.. does it have a replacement?
+		assert_expected_events!(AssetHubPolkadot, vec![]);
 	});
 
 	// Check if balances are updated accordingly in Relay Chain and Assets Parachain

diff --git a/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs b/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
@@ -21,8 +21,8 @@ pub use xcm::{
 	},
 };
 pub use xcm_emulator::{
-	assert_expected_events, bx, cumulus_pallet_dmp_queue, helpers::weight_within_threshold,
-	Parachain as Para, RelayChain as Relay, TestExt,
+	assert_expected_events, bx, helpers::weight_within_threshold, Parachain as Para,
+	RelayChain as Relay, TestExt,
 };
 
 #[cfg(test)]

diff --git a/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs b/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
@@ -44,15 +44,8 @@ fn reserve_transfer_native_asset_from_relay_to_assets() {
 	AssetHubWestend::execute_with(|| {
 		type RuntimeEvent = <AssetHubWestend as Para>::RuntimeEvent;
 
-		assert_expected_events!(
-			AssetHubWestend,
-			vec![
-				RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-					outcome: Outcome::Incomplete(_, Error::UntrustedReserveLocation),
-					..
-				}) => {},
-			]
-		);
+		// TODO: This used to emit an event at the DmpQueue pallet which is not gone.. does it have a replacement?
+		assert_expected_events!(AssetHubWestend, vec![]);
 	});
 
 	// Check if balances are updated accordingly in Relay Chain and Assets Parachain