Create xcm emulator tests for People-Rococo

cumulus/parachains/integration-tests/emulated/common/src/lib.rs

@@ -86,43 +86,6 @@ pub fn get_host_config() -> HostConfiguration<BlockNumber> {
 	}
 }
 
-/// Returns a [`TestArgs`] instance to be used for the Relay Chain across integration tests
-pub fn relay_test_args(
-	dest: MultiLocation,
-	beneficiary_id: AccountId32,
-	amount: Balance,
-) -> TestArgs {
-	TestArgs {
-		dest,
-		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
-		amount,
-		assets: (Here, amount).into(),
-		asset_id: None,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-/// Returns a [`TestArgs`] instance to be used by parachains across integration tests
-pub fn para_test_args(
-	dest: MultiLocation,
-	beneficiary_id: AccountId32,
-	amount: Balance,
-	assets: MultiAssets,
-	asset_id: Option<u32>,
-	fee_asset_item: u32,
-) -> TestArgs {
-	TestArgs {
-		dest,
-		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
-		amount,
-		assets,
-		asset_id,
-		fee_asset_item,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
 /// Helper function used in tests to build the genesis storage using given RuntimeGenesisConfig and
 /// code Used in `legacy_vs_json_check` submods to verify storage building with JSON patch against
 /// building with RuntimeGenesisConfig struct.

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/reserve_transfer.rs

@@ -15,7 +15,6 @@
 
 use crate::*;
 use asset_hub_rococo_runtime::xcm_config::XcmConfig as AssetHubRococoXcmConfig;
-use emulated_integration_tests_common::{para_test_args, relay_test_args};
 use penpal_runtime::xcm_config::XcmConfig as PenpalRococoXcmConfig;
 use rococo_runtime::xcm_config::XcmConfig as RococoXcmConfig;
 
@@ -276,7 +275,7 @@ fn reserve_transfer_native_asset_from_relay_to_para() {
 	let test_args = TestContext {
 		sender: RococoSender::get(),
 		receiver: PenpalAReceiver::get(),
-		args: relay_test_args(destination, beneficiary_id, amount_to_send),
+		args: TestArgs::new_relay(destination, beneficiary_id, amount_to_send),
 	};
 
 	let mut test = RelayToParaTest::new(test_args);
@@ -320,7 +319,7 @@ fn reserve_transfer_native_asset_from_system_para_to_para() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: PenpalAReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToParaTest::new(test_args);
@@ -364,7 +363,7 @@ fn reserve_transfer_native_asset_from_para_to_system_para() {
 	let test_args = TestContext {
 		sender: PenpalASender::get(),
 		receiver: AssetHubRococoReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = ParaToSystemParaTest::new(test_args);
@@ -444,7 +443,7 @@ fn reserve_transfer_assets_from_system_para_to_para() {
 	let para_test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: PenpalAReceiver::get(),
-		args: para_test_args(
+		args: TestArgs::new_para(
 			destination,
 			beneficiary_id,
 			asset_amount_to_send,

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/teleport.rs

@@ -1,4 +1,4 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Lt,
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,6 @@
 
 use crate::*;
 use asset_hub_rococo_runtime::xcm_config::XcmConfig as AssetHubRococoXcmConfig;
-use emulated_integration_tests_common::{para_test_args, relay_test_args};
 use rococo_runtime::xcm_config::XcmConfig as RococoXcmConfig;
 
 fn relay_origin_assertions(t: RelayToSystemParaTest) {
@@ -163,7 +162,7 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 	let test_args = TestContext {
 		sender: RococoSender::get(),
 		receiver: AssetHubRococoReceiver::get(),
-		args: relay_test_args(dest, beneficiary_id, amount_to_send),
+		args: TestArgs::new_relay(dest, beneficiary_id, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -207,7 +206,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -248,7 +247,7 @@ fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -286,7 +285,7 @@ fn teleport_native_assets_from_relay_to_system_para_works() {
 	let test_args = TestContext {
 		sender: RococoSender::get(),
 		receiver: AssetHubRococoReceiver::get(),
-		args: relay_test_args(dest, beneficiary_id, amount_to_send),
+		args: TestArgs::new_relay(dest, beneficiary_id, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -330,7 +329,7 @@ fn teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -371,7 +370,7 @@ fn teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/reserve_transfer.rs

@@ -15,7 +15,6 @@
 
 use crate::*;
 use asset_hub_westend_runtime::xcm_config::XcmConfig as AssetHubWestendXcmConfig;
-use emulated_integration_tests_common::{para_test_args, relay_test_args};
 use penpal_runtime::xcm_config::XcmConfig as PenpalWestendXcmConfig;
 use westend_runtime::xcm_config::XcmConfig as WestendXcmConfig;
 
@@ -275,7 +274,7 @@ fn reserve_transfer_native_asset_from_relay_to_para() {
 	let test_args = TestContext {
 		sender: WestendSender::get(),
 		receiver: PenpalBReceiver::get(),
-		args: relay_test_args(destination, beneficiary_id, amount_to_send),
+		args: TestArgs::new_relay(destination, beneficiary_id, amount_to_send),
 	};
 
 	let mut test = RelayToParaTest::new(test_args);
@@ -319,7 +318,7 @@ fn reserve_transfer_native_asset_from_system_para_to_para() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: PenpalBReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_parachain(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToParaTest::new(test_args);
@@ -363,7 +362,7 @@ fn reserve_transfer_native_asset_from_para_to_system_para() {
 	let test_args = TestContext {
 		sender: PenpalBSender::get(),
 		receiver: AssetHubWestendReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = ParaToSystemParaTest::new(test_args);
@@ -444,7 +443,7 @@ fn reserve_transfer_assets_from_system_para_to_para() {
 	let para_test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: PenpalBReceiver::get(),
-		args: para_test_args(
+		args: TestArgs::new_para(
 			destination,
 			beneficiary_id,
 			asset_amount_to_send,

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/teleport.rs

@@ -15,7 +15,6 @@
 
 use crate::*;
 use asset_hub_westend_runtime::xcm_config::XcmConfig as AssetHubWestendXcmConfig;
-use emulated_integration_tests_common::{para_test_args, relay_test_args};
 use westend_runtime::xcm_config::XcmConfig as WestendXcmConfig;
 
 fn relay_origin_assertions(t: RelayToSystemParaTest) {
@@ -163,7 +162,7 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 	let test_args = TestContext {
 		sender: WestendSender::get(),
 		receiver: beneficiary.clone(),
-		args: relay_test_args(dest, beneficiary, amount_to_send),
+		args: TestArgs::new_relay(dest, beneficiary, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -207,7 +206,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -248,7 +247,7 @@ fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -286,7 +285,7 @@ fn teleport_native_assets_from_relay_to_system_para_works() {
 	let test_args = TestContext {
 		sender: WestendSender::get(),
 		receiver: beneficiary.clone(),
-		args: relay_test_args(dest, beneficiary, amount_to_send),
+		args: TestArgs::new_relay(dest, beneficiary, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -330,7 +329,7 @@ fn teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -371,7 +370,7 @@ fn teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);

cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/src/tests/reap_identity.rs

@@ -165,10 +165,6 @@ impl IdentityOn<'_> {
 ///
 /// `account_from_u32(5)` will return an `AccountId32` with the bytes
 /// `[0, 5, 0, 0, 0, 0, 0, 0, 0, 5 ... ]`
-///
-/// **Note**
-///
-/// This is only used for testing and is not intended for production use.
 fn account_from_u32(id: u32) -> AccountId32 {
 	let mut buffer = [255u8; 32];
 	let id_bytes = id.to_le_bytes();
@@ -198,9 +194,9 @@ fn set_id_relay(id: &Identity) -> Balance {
 			Subs::Zero => {},
 			Subs::Many(n) => {
 				let mut subs = Vec::with_capacity(n.try_into().unwrap());
-				for ii in 0..n {
+				for i in 0..n {
 					subs.push((
-						account_from_u32(ii),
+						AccountId32::from(i),
 						Data::Raw(b"name".to_vec().try_into().unwrap()),
 					));
 				}

cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/src/tests/teleport.rs

@@ -14,7 +14,6 @@
 // limitations under the License.
 
 use crate::*;
-use emulated_integration_tests_common::{para_test_args, relay_test_args};
 use people_rococo_runtime::xcm_config::XcmConfig as PeopleRococoXcmConfig;
 use rococo_runtime::xcm_config::XcmConfig as RococoXcmConfig;
 
@@ -142,7 +141,7 @@ fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 	let test_args = TestContext {
 		sender: RococoSender::get(),
 		receiver: PeopleRococoReceiver::get(),
-		args: relay_test_args(dest, beneficiary_id, amount_to_send),
+		args: TestArgs::new_relay(dest, beneficiary_id, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -188,7 +187,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: PeopleRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -232,7 +231,7 @@ fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: PeopleRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+		args: TestArgs::new_para(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);

cumulus/xcm/xcm-emulator/src/lib.rs

@@ -1436,6 +1436,7 @@ pub struct TestArgs {
 }
 
 impl TestArgs {
+	/// Returns a [`TestArgs`] instance to be used for the Relay Chain across integration tests
 	pub fn new_relay(dest: MultiLocation, beneficiary_id: AccountId32, amount: Balance) -> Self {
 		Self {
 			dest,
@@ -1448,11 +1449,14 @@ impl TestArgs {
 		}
 	}
 
-	pub fn new_parachain(
+	/// Returns a [`TestArgs`] instance to be used by parachains across integration tests
+	pub fn new_para(
 		dest: MultiLocation,
 		beneficiary_id: AccountId32,
 		amount: Balance,
+		assets: MultiAssets,
 		asset_id: Option<u32>,
+		fee_asset_item: u32,
 	) -> Self {
 		Self {
 			dest,

substrate/primitives/core/src/crypto.rs

@@ -554,6 +554,28 @@ impl From<[u8; 32]> for AccountId32 {
 	}
 }
 
+/// Generate an `AccountId32` from a `u32`.
+/// This creates a 32-byte array, initially filled with `255`, and then repeatedly fills it
+/// with the 4-byte little-endian representation of the `u32` value, until the array is full.
+///
+/// **Example**:
+///
+/// `account_from_u32(5)` will return an `AccountId32` with the bytes
+/// `[0, 5, 0, 0, 0, 0, 0, 0, 0, 5 ... ]`
+impl From<u32> for AccountId32 {
+	fn from(id: u32) -> Self {
+		let mut buffer = [255u8; 32];
+		let id_bytes = id.to_le_bytes();
+		let id_size = id_bytes.len();
+		for i in 0..buffer.len() / id_size {
+			let start = i * id_size;
+			let end = start + id_size;
+			buffer[start..end].clone_from_slice(&id_bytes[..]);
+		}
+		Self::new(buffer)
+	}
+}
+
 impl<'a> TryFrom<&'a [u8]> for AccountId32 {
 	type Error = ();
 	fn try_from(x: &'a [u8]) -> Result<AccountId32, ()> {