make tests work

xcm/pallet-xcm-benchmarks/src/fungible/mock.rs

@@ -25,7 +25,7 @@ use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
-use xcm::latest::{Junction, MultiAsset, MultiLocation, NetworkId};
+use xcm::latest::{AssetId::*, Fungibility::*, Junction, MultiAsset, MultiLocation, NetworkId};
 use xcm_builder::{
 	AllowBenchmarks, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom,
 	IsChildSystemParachain, TakeWeightCredit,
@@ -107,7 +107,7 @@ impl xcm_executor::traits::MatchesFungible<u64> for MatchAnyFungible {
 	fn matches_fungible(m: &MultiAsset) -> Option<u64> {
 		use sp_runtime::traits::SaturatedConversion;
 		match m {
-			MultiAsset::ConcreteFungible { amount, .. } => Some((*amount).saturated_into::<u64>()),
+			MultiAsset { fun: Fungible(amount), .. } => Some((*amount).saturated_into::<u64>()),
 			_ => None,
 		}
 	}
@@ -122,17 +122,6 @@ pub type AssetTransactor = xcm_builder::CurrencyAdapter<
 	CheckedAccount,
 >;
 
-/// The barriers one of which must be passed for an XCM message to be executed.
-pub type Barrier = (
-	// Weight that is paid for may be consumed.
-	TakeWeightCredit,
-	// If the message is one that immediately attemps to pay for execution, then allow it.
-	AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,
-	// Messages coming from system parachains need not pay for execution.
-	AllowUnpaidExecutionFrom<IsChildSystemParachain<ParaId>>,
-	AllowBenchmarks,
-);
-
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type Call = Call;
@@ -142,7 +131,7 @@ impl xcm_executor::Config for XcmConfig {
 	type IsReserve = ();
 	type IsTeleporter = ();
 	type LocationInverter = xcm_builder::LocationInverter<Ancestry>;
-	type Barrier = Barrier;
+	type Barrier = YesItShould;
 	type Weigher = xcm_builder::FixedWeightBounds<UnitWeightCost, Call>;
 	type Trader = xcm_builder::FixedRateOfConcreteFungible<WeightPrice, ()>;
 	type ResponseHandler = DevNull;
@@ -169,7 +158,7 @@ impl xcm_balances_benchmark::Config for Test {
 	fn get_multi_asset() -> MultiAsset {
 		let amount =
 			<Balances as frame_support::traits::fungible::Inspect<u64>>::minimum_balance() as u128;
-		MultiAsset::ConcreteFungible { id: MultiLocation::Null, amount }
+		MultiAsset { id: Concrete(MultiLocation::Here), fun: Fungible(amount) }
 	}
 }
 

xcm/pallet-xcm-benchmarks/src/fungibles/mock.rs

@@ -29,12 +29,14 @@ use sp_runtime::{
 };
 use xcm::{
 	latest::Junction,
-	opaque::latest::{MultiAsset, MultiLocation},
+	opaque::latest::{AssetId, MultiAsset, MultiLocation},
 };
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
+type AccountId = u64;
+
 // For testing the pallet, we construct a mock runtime.
 frame_support::construct_runtime!(
 	pub enum Test where
@@ -66,7 +68,7 @@ impl frame_system::Config for Test {
 	type Hash = H256;
 	type Call = Call;
 	type Hashing = BlakeTwo256;
-	type AccountId = u64;
+	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
 	type Event = Event;
@@ -105,10 +107,12 @@ parameter_types! {
 	pub const MetadataDepositPerByte: u64 = 1 * ExistentialDeposit::get();
 }
 
+type AssetsAssetId = u32;
+
 impl pallet_assets::Config for Test {
 	type Event = Event;
 	type Balance = u64;
-	type AssetId = u32;
+	type AssetId = AssetsAssetId;
 	type Currency = Balances;
 	type ForceOrigin = frame_system::EnsureRoot<u64>;
 	type AssetDeposit = AssetDeposit;
@@ -131,13 +135,11 @@ impl Contains<u32> for CheckAsset {
 pub struct MatchAnyFungibles;
 impl xcm_executor::traits::MatchesFungibles<u32, u64> for MatchAnyFungibles {
 	fn matches_fungibles(m: &MultiAsset) -> Result<(u32, u64), xcm_executor::traits::Error> {
-		//                                                     ^^ TODO: this error is too out of scope.
+		//                                                      ^^ TODO: this error is too out of scope.
 		use sp_runtime::traits::SaturatedConversion;
 		match m {
-			MultiAsset::ConcreteFungible {
-				amount,
-				id: MultiLocation::X1(Junction::GeneralIndex { id }),
-			} => Ok(((*id).saturated_into(), (*amount).saturated_into::<u64>())),
+			MultiAsset { id: Concrete(X1(GeneralIndex { id })), fun: Fungible(amount) } =>
+				Ok(((*id).saturated_into::<u32>(), (*amount).saturated_into::<u64>())),
 			_ => Err(xcm_executor::traits::Error::AssetNotFound),
 		}
 	}
@@ -151,7 +153,7 @@ pub type AssetTransactor = xcm_builder::FungiblesAdapter<
 	Assets,
 	MatchAnyFungibles,
 	AccountIdConverter,
-	u64,
+	AccountId,
 	CheckAsset,
 	CheckedAccount,
 >;
@@ -189,9 +191,9 @@ impl xcm_assets_benchmarks::Config for Test {
 		}
 
 		let amount = <Assets as Inspect<u64>>::minimum_balance(id) as u128;
-		MultiAsset::ConcreteFungible {
-			id: MultiLocation::X1(Junction::GeneralIndex { id: id.into() }),
-			amount,
+		MultiAsset {
+			id: Concrete(X1(Junction::GeneralIndex { id: id.into() })),
+			fun: Fungible(amount),
 		}
 	}
 }

xcm/pallet-xcm-benchmarks/src/mock.rs

@@ -66,5 +66,5 @@ impl xcm_executor::traits::Convert<MultiLocation, u64> for AccountIdConverter {
 parameter_types! {
 	pub Ancestry: MultiLocation = MultiLocation::X1(Junction::Parachain(101));
 	pub UnitWeightCost: Weight = 10;
-	pub WeightPrice: (MultiLocation, u128) = (MultiLocation::Null, 1_000_000_000_000);
+	pub WeightPrice: (MultiLocation, u128) = (MultiLocation::Here, 1_000_000_000_000);
 }