From e02878e87a46a865aec00ddd11351403aaee3bae Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Thu, 22 Sep 2022 23:16:22 +0800
Subject: [PATCH] Fixes

---
 pallets/dmp-queue/src/lib.rs                         | 3 ++-
 pallets/parachain-system/src/validate_block/tests.rs | 3 ++-
 pallets/xcm/src/lib.rs                               | 3 ++-
 parachains/common/src/xcm_config.rs                  | 8 +++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs
index 5c3a0dc572..3dfcae436f 100644
--- a/pallets/dmp-queue/src/lib.rs
+++ b/pallets/dmp-queue/src/lib.rs
@@ -240,7 +240,8 @@ pub mod pallet {
 					Ok(Weight::zero())
 				},
 				Ok(Ok(x)) => {
-					let outcome = T::XcmExecutor::execute_xcm(Parent, x, message_id, limit.ref_time());
+					let outcome =
+						T::XcmExecutor::execute_xcm(Parent, x, message_id, limit.ref_time());
 					match outcome {
 						Outcome::Error(XcmError::WeightLimitReached(required)) =>
 							Err((message_id, Weight::from_ref_time(required))),
diff --git a/pallets/parachain-system/src/validate_block/tests.rs b/pallets/parachain-system/src/validate_block/tests.rs
index e06c2cafdc..6087e6a29a 100644
--- a/pallets/parachain-system/src/validate_block/tests.rs
+++ b/pallets/parachain-system/src/validate_block/tests.rs
@@ -284,7 +284,8 @@ fn check_inherents_are_unsigned_and_before_all_other_extrinsics() {
 			.expect("Runs the test");
 		assert!(output.status.success());
 
-		assert!(String::from_utf8(output.stderr).unwrap()
+		assert!(String::from_utf8(output.stderr)
+			.unwrap()
 			.contains("Could not find `set_validation_data` inherent"));
 	}
 }
diff --git a/pallets/xcm/src/lib.rs b/pallets/xcm/src/lib.rs
index 1d87187cde..bd015dce17 100644
--- a/pallets/xcm/src/lib.rs
+++ b/pallets/xcm/src/lib.rs
@@ -157,7 +157,8 @@ impl<T: Config> DmpMessageHandler for LimitAndDropDmpExecution<T> {
 				Ok(Err(())) => Pallet::<T>::deposit_event(Event::UnsupportedVersion(id)),
 				Ok(Ok(x)) => {
 					let weight_limit = limit.saturating_sub(used);
-					let outcome = T::XcmExecutor::execute_xcm(Parent, x, id, weight_limit.ref_time());
+					let outcome =
+						T::XcmExecutor::execute_xcm(Parent, x, id, weight_limit.ref_time());
 					used += Weight::from_ref_time(outcome.weight_used());
 					Pallet::<T>::deposit_event(Event::ExecutedDownward(id, outcome));
 				},
diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs
index 73e6d9e93b..91d1c46a2f 100644
--- a/parachains/common/src/xcm_config.rs
+++ b/parachains/common/src/xcm_config.rs
@@ -2,7 +2,7 @@ use crate::impls::AccountIdOf;
 use core::marker::PhantomData;
 use frame_support::{
 	log,
-	traits::{fungibles::Inspect, tokens::BalanceConversion},
+	traits::{fungibles::Inspect, tokens::BalanceConversion, ContainsPair},
 	weights::{Weight, WeightToFee, WeightToFeePolynomial},
 };
 use sp_runtime::traits::Get;
@@ -111,8 +111,10 @@ where
 
 /// Accepts an asset if it is a native asset from a particular `MultiLocation`.
 pub struct ConcreteNativeAssetFrom<Location>(PhantomData<Location>);
-impl<Location: Get<MultiLocation>> FilterAssetLocation for ConcreteNativeAssetFrom<Location> {
-	fn filter_asset_location(asset: &MultiAsset, origin: &MultiLocation) -> bool {
+impl<Location: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation>
+	for ConcreteNativeAssetFrom<Location>
+{
+	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
 		log::trace!(target: "xcm::filter_asset_location",
 			"ConcreteNativeAsset asset: {:?}, origin: {:?}, location: {:?}",
 			asset, origin, Location::get());