WIP: XCMv4 renaming

Author: bkontur

integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs

@@ -83,7 +83,7 @@ pub fn para_test_args(
 	dest: Location,
 	beneficiary_id: AccountId32,
 	amount: Balance,
-	assets: MultiAssets,
+	assets: Assets,
 	asset_id: Option<u32>,
 	fee_asset_item: u32,
 ) -> TestArgs {

integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs

@@ -195,7 +195,7 @@ fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
 	let beneficiary: Location =
 		AccountId32Junction { network: None, id: AssetHubKusamaReceiver::get().into() }.into();
 	let amount_to_send: Balance = KUSAMA_ED * 1000;
-	let assets: MultiAssets = (Here, amount_to_send).into();
+	let assets: Assets = (Here, amount_to_send).into();
 	let fee_asset_item = 0;
 
 	// this should fail
@@ -231,7 +231,7 @@ fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
 		AccountId32Junction { network: None, id: beneficiary_id.into() }.into();
 	let amount_to_send: Balance = ASSET_HUB_KUSAMA_ED * 1000;
 
-	let assets: MultiAssets = (Parent, amount_to_send).into();
+	let assets: Assets = (Parent, amount_to_send).into();
 	let fee_asset_item = 0;
 
 	// this should fail
@@ -421,7 +421,7 @@ fn reserve_transfer_assets_from_system_para_to_para() {
 	let beneficiary_id = PenpalKusamaAReceiver::get();
 	let fee_amount_to_send = ASSET_HUB_KUSAMA_ED * 1000;
 	let asset_amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets: MultiAssets = vec![
+	let assets: Assets = vec![
 		(Parent, fee_amount_to_send).into(),
 		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), asset_amount_to_send)
 			.into(),

integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs

@@ -540,7 +540,7 @@ fn teleport_native_assets_from_system_para_to_relay_fails() {
 #[test]
 fn teleport_to_other_system_parachains_works() {
 	let amount = ASSET_HUB_KUSAMA_ED * 100;
-	let native_asset: MultiAssets = (Parent, amount).into();
+	let native_asset: Assets = (Parent, amount).into();
 
 	test_parachain_is_trusted_teleporter!(
 		AssetHubKusama,          // Origin
@@ -578,7 +578,7 @@ fn bidirectional_teleport_foreign_assets_between_para_and_asset_hub() {
 	let fee_amount_to_send = ASSET_HUB_KUSAMA_ED * 10_000;
 	let asset_amount_to_send = ASSET_MIN_BALANCE * 1000;
 
-	let penpal_assets: MultiAssets = vec![
+	let penpal_assets: Assets = vec![
 		(Parent, fee_amount_to_send).into(),
 		(asset_location_on_penpal, asset_amount_to_send).into(),
 	]
@@ -670,7 +670,7 @@ fn bidirectional_teleport_foreign_assets_between_para_and_asset_hub() {
 
 	let ah_to_penpal_beneficiary_id = PenpalKusamaAReceiver::get();
 	let penpal_as_seen_by_ah = AssetHubKusama::sibling_location_of(PenpalKusamaA::para_id());
-	let ah_assets: MultiAssets = vec![
+	let ah_assets: Assets = vec![
 		(Parent, fee_amount_to_send).into(),
 		(foreign_asset_at_asset_hub_kusama, asset_amount_to_send).into(),
 	]

integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs

@@ -83,7 +83,7 @@ pub fn para_test_args(
 	dest: Location,
 	beneficiary_id: AccountId32,
 	amount: Balance,
-	assets: MultiAssets,
+	assets: Assets,
 	asset_id: Option<u32>,
 	fee_asset_item: u32,
 ) -> TestArgs {

integration-tests/emulated/assets/asset-hub-polkadot/src/tests/reserve_transfer.rs

@@ -195,7 +195,7 @@ fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
 	let beneficiary: Location =
 		AccountId32Junction { network: None, id: AssetHubPolkadotReceiver::get().into() }.into();
 	let amount_to_send: Balance = POLKADOT_ED * 1000;
-	let assets: MultiAssets = (Here, amount_to_send).into();
+	let assets: Assets = (Here, amount_to_send).into();
 	let fee_asset_item = 0;
 
 	// this should fail
@@ -231,7 +231,7 @@ fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
 		AccountId32Junction { network: None, id: beneficiary_id.into() }.into();
 	let amount_to_send: Balance = ASSET_HUB_POLKADOT_ED * 1000;
 
-	let assets: MultiAssets = (Parent, amount_to_send).into();
+	let assets: Assets = (Parent, amount_to_send).into();
 	let fee_asset_item = 0;
 
 	// this should fail
@@ -422,7 +422,7 @@ fn reserve_transfer_assets_from_system_para_to_para() {
 	let beneficiary_id = PenpalPolkadotAReceiver::get();
 	let fee_amount_to_send = ASSET_HUB_POLKADOT_ED * 1000;
 	let asset_amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets: MultiAssets = vec![
+	let assets: Assets = vec![
 		(Parent, fee_amount_to_send).into(),
 		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), asset_amount_to_send)
 			.into(),

integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs

@@ -540,7 +540,7 @@ fn teleport_native_assets_from_system_para_to_relay_fails() {
 #[test]
 fn teleport_to_other_system_parachains_works() {
 	let amount = ASSET_HUB_POLKADOT_ED * 100;
-	let native_asset: MultiAssets = (Parent, amount).into();
+	let native_asset: Assets = (Parent, amount).into();
 
 	test_parachain_is_trusted_teleporter!(
 		AssetHubPolkadot,          // Origin
@@ -578,7 +578,7 @@ fn bidirectional_teleport_foreign_assets_between_para_and_asset_hub() {
 	let fee_amount_to_send = ASSET_HUB_POLKADOT_ED * 10_000;
 	let asset_amount_to_send = ASSET_MIN_BALANCE * 1000;
 
-	let penpal_assets: MultiAssets = vec![
+	let penpal_assets: Assets = vec![
 		(Parent, fee_amount_to_send).into(),
 		(asset_location_on_penpal, asset_amount_to_send).into(),
 	]
@@ -670,7 +670,7 @@ fn bidirectional_teleport_foreign_assets_between_para_and_asset_hub() {
 
 	let ah_to_penpal_beneficiary_id = PenpalPolkadotAReceiver::get();
 	let penpal_as_seen_by_ah = AssetHubPolkadot::sibling_location_of(PenpalPolkadotA::para_id());
-	let ah_assets: MultiAssets = vec![
+	let ah_assets: Assets = vec![
 		(Parent, fee_amount_to_send).into(),
 		(foreign_asset_at_asset_hub_polkadot, asset_amount_to_send).into(),
 	]

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

@@ -183,7 +183,7 @@ macro_rules! include_penpal_create_foreign_asset_on_asset_hub {
 				let buy_execution_fee_amount = $weight_to_fee::weight_to_fee(
 					&Weight::from_parts(10_100_000_000_000, 300_000),
 				);
-				let buy_execution_fee = MultiAsset {
+				let buy_execution_fee = Asset {
 					id: Concrete(Location { parents: 1, interior: Here }),
 					fun: Fungible(buy_execution_fee_amount),
 				};

integration-tests/emulated/common/src/xcm_helpers.rs

@@ -21,12 +21,12 @@ use xcm::{prelude::*, DoubleEncoded};
 pub fn xcm_transact_paid_execution(
 	call: DoubleEncoded<()>,
 	origin_kind: OriginKind,
-	native_asset: MultiAsset,
+	native_asset: Asset,
 	beneficiary: AccountId,
 ) -> VersionedXcm<()> {
 	let weight_limit = WeightLimit::Unlimited;
 	let require_weight_at_most = Weight::from_parts(1000000000, 200000);
-	let native_assets: MultiAssets = native_asset.clone().into();
+	let native_assets: Assets = native_asset.clone().into();
 
 	VersionedXcm::from(Xcm(vec![
 		WithdrawAsset(native_assets),
@@ -58,7 +58,7 @@ pub fn xcm_transact_unpaid_execution(
 	]))
 }
 /// Helper method to get the non-fee asset used in multiple assets transfer
-pub fn non_fee_asset(assets: &MultiAssets, fee_idx: usize) -> Option<(Location, u128)> {
+pub fn non_fee_asset(assets: &Assets, fee_idx: usize) -> Option<(Location, u128)> {
 	let asset = assets.inner().into_iter().enumerate().find(|a| a.0 != fee_idx)?.1.clone();
 	let asset_id = match asset.id {
 		Concrete(id) => id,

relay/kusama/src/lib.rs

@@ -2354,18 +2354,18 @@ sp_api::impl_runtime_apis! {
 					Some(crate::xcm_config::AssetHubLocation::get())
 				}
 
-				fn teleportable_asset_and_dest() -> Option<(MultiAsset, Location)> {
+				fn teleportable_asset_and_dest() -> Option<(Asset, Location)> {
 					// Relay/native token can be teleported to/from AH.
 					Some((
-						MultiAsset { fun: Fungible(EXISTENTIAL_DEPOSIT), id: Concrete(Here.into()) },
+						Asset { fun: Fungible(EXISTENTIAL_DEPOSIT), id: Concrete(Here.into()) },
 						crate::xcm_config::AssetHubLocation::get(),
 					))
 				}
 
-				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, Location)> {
+				fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> {
 					// Relay can reserve transfer native token to some random parachain.
 					Some((
-						MultiAsset {
+						Asset {
 							fun: Fungible(EXISTENTIAL_DEPOSIT),
 							id: Concrete(Here.into())
 						},
@@ -2374,7 +2374,7 @@ sp_api::impl_runtime_apis! {
 				}
 
 				fn set_up_complex_asset_transfer(
-				) -> Option<(MultiAssets, u32, Location, Box<dyn FnOnce()>)> {
+				) -> Option<(Assets, u32, Location, Box<dyn FnOnce()>)> {
 					// Relay supports only native token, either reserve transfer it to non-system parachains,
 					// or teleport it to system parachain. Use the teleport case for benchmarking as it's
 					// slightly heavier.
@@ -2389,7 +2389,7 @@ sp_api::impl_runtime_apis! {
 			}
 
 			parameter_types! {
-				pub ExistentialDepositMultiAsset: Option<MultiAsset> = Some((
+				pub ExistentialDepositAsset: Option<Asset> = Some((
 					TokenLocation::get(),
 					ExistentialDeposit::get()
 				).into());
@@ -2401,29 +2401,29 @@ sp_api::impl_runtime_apis! {
 				type AccountIdConverter = SovereignAccountOf;
 				type DeliveryHelper = runtime_common::xcm_sender::ToParachainDeliveryHelper<
 					XcmConfig,
-					ExistentialDepositMultiAsset,
+					ExistentialDepositAsset,
 					xcm_config::PriceForChildParachainDelivery,
 					ToParachain,
 					(),
 				>;
 				fn valid_destination() -> Result<Location, BenchmarkError> {
 					Ok(AssetHubLocation::get())
 				}
-				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
+				fn worst_case_holding(_depositable_count: u32) -> Assets {
 					// Kusama only knows about KSM.
-					vec![MultiAsset{
+					vec![Asset{
 						id: Concrete(TokenLocation::get()),
 						fun: Fungible(1_000_000 * UNITS),
 					}].into()
 				}
 			}
 
 			parameter_types! {
-				pub const TrustedTeleporter: Option<(Location, MultiAsset)> = Some((
+				pub const TrustedTeleporter: Option<(Location, Asset)> = Some((
 					AssetHubLocation::get(),
-					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(TokenLocation::get()) },
+					Asset { fun: Fungible(1 * UNITS), id: Concrete(TokenLocation::get()) },
 				));
-				pub const TrustedReserve: Option<(Location, MultiAsset)> = None;
+				pub const TrustedReserve: Option<(Location, Asset)> = None;
 			}
 
 			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
@@ -2433,8 +2433,8 @@ sp_api::impl_runtime_apis! {
 				type TrustedTeleporter = TrustedTeleporter;
 				type TrustedReserve = TrustedReserve;
 
-				fn get_multi_asset() -> MultiAsset {
-					MultiAsset {
+				fn get_multi_asset() -> Asset {
+					Asset {
 						id: Concrete(TokenLocation::get()),
 						fun: Fungible(1 * UNITS),
 					}
@@ -2449,7 +2449,7 @@ sp_api::impl_runtime_apis! {
 					(0u64, Response::Version(Default::default()))
 				}
 
-				fn worst_case_asset_exchange() -> Result<(MultiAssets, MultiAssets), BenchmarkError> {
+				fn worst_case_asset_exchange() -> Result<(Assets, Assets), BenchmarkError> {
 					// Kusama doesn't support asset exchanges
 					Err(BenchmarkError::Skip)
 				}
@@ -2467,21 +2467,21 @@ sp_api::impl_runtime_apis! {
 					Ok(AssetHubLocation::get())
 				}
 
-				fn claimable_asset() -> Result<(Location, Location, MultiAssets), BenchmarkError> {
+				fn claimable_asset() -> Result<(Location, Location, Assets), BenchmarkError> {
 					let origin = AssetHubLocation::get();
-					let assets: MultiAssets = (Concrete(TokenLocation::get()), 1_000 * UNITS).into();
+					let assets: Assets = (Concrete(TokenLocation::get()), 1_000 * UNITS).into();
 					let ticket = Location { parents: 0, interior: Here };
 					Ok((origin, ticket, assets))
 				}
 
-				fn fee_asset() -> Result<MultiAsset, BenchmarkError> {
-					Ok(MultiAsset {
+				fn fee_asset() -> Result<Asset, BenchmarkError> {
+					Ok(Asset {
 						id: Concrete(TokenLocation::get()),
 						fun: Fungible(1_000_000 * UNITS),
 					})
 				}
 
-				fn unlockable_asset() -> Result<(Location, Location, MultiAsset), BenchmarkError> {
+				fn unlockable_asset() -> Result<(Location, Location, Asset), BenchmarkError> {
 					// Kusama doesn't support asset locking
 					Err(BenchmarkError::Skip)
 				}