From a9466554b2d2dc751e4049b2192786b9aaa08297 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Tue, 31 Oct 2023 17:52:33 +0100 Subject: [PATCH] Add dependencies --- Cargo.lock | 20 ++++++++++++++++++++ runtime/integration-tests/Cargo.toml | 6 ++++++ runtime/integration-tests/src/mock.rs | 23 ++++++++++------------- runtime/integration-tests/src/sibling.rs | 9 --------- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3dd708eec..5c9b7f469 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6185,6 +6185,20 @@ dependencies = [ "sp-std", ] +[[package]] +name = "orml-xcm" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.40#19afb58a300faac6ceb0e6e4e341859282897c53" +dependencies = [ + "frame-support", + "frame-system", + "pallet-xcm", + "parity-scale-codec", + "scale-info", + "sp-std", + "xcm", +] + [[package]] name = "orml-xcm-support" version = "0.4.1-dev" @@ -9947,11 +9961,16 @@ version = "0.1.0" dependencies = [ "amplitude-runtime", "cumulus-pallet-dmp-queue", + "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", "frame-support", "frame-system", "kusama-runtime", "orml-tokens", + "orml-traits", + "orml-xcm", + "orml-xcm-support", "orml-xtokens", "pallet-assets", "pallet-balances", @@ -9970,6 +9989,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-tracing", "statemine-runtime", "statemint-runtime", "xcm", diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index 1ccea787d..8bf29961b 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -17,6 +17,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } @@ -34,11 +35,16 @@ xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "bea35c cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40"} cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40"} +cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40"} +cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40"} parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } statemint-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +orml-xcm = {git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.40" } +orml-xcm-support = {git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.40" } +orml-traits = {git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.40" } orml-tokens = {git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.40" } orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.40" } diff --git a/runtime/integration-tests/src/mock.rs b/runtime/integration-tests/src/mock.rs index a8035c1a1..fe68daacd 100644 --- a/runtime/integration-tests/src/mock.rs +++ b/runtime/integration-tests/src/mock.rs @@ -115,8 +115,8 @@ pub enum ParachainType { PolkadotAssetHub, KusamaAssetHub, Pendulum, - Pendulum2, Amplitude, + Sibling, } pub struct ExtBuilderParachain { @@ -187,11 +187,9 @@ pub fn para_ext(chain: ParachainType) -> sp_io::TestExternalities { ParachainType::KusamaAssetHub => ExtBuilderParachain::kusama_asset_hub_default().balances(vec![]).build(), ParachainType::Pendulum => ExtBuilderParachain::pendulum_default().balances(vec![]).build(), - // for second Pendulum instance used for transferring native token - ParachainType::Pendulum2 => - ExtBuilderParachain::pendulum2_default().balances(vec![]).build(), ParachainType::Amplitude => ExtBuilderParachain::amplitude_default().balances(vec![]).build(), + ParachainType::Sibling => ExtBuilderParachain::sibling_default().balances(vec![]).build(), } } @@ -212,14 +210,14 @@ impl ExtBuilderParachain { pub fn pendulum_default() -> Self { Self { balances: vec![], chain: ParachainType::Pendulum } } - // for second Pendulum instance used for transferring native token - pub fn pendulum2_default() -> Self { - Self { balances: vec![], chain: ParachainType::Pendulum2 } - } pub fn amplitude_default() -> Self { Self { balances: vec![], chain: ParachainType::Amplitude } } + + pub fn sibling_default() -> Self { + Self { balances: vec![], chain: ParachainType::Sibling } + } } impl Builder for ExtBuilderParachain { @@ -240,9 +238,8 @@ impl Builder for ExtBuilderParachain { ORML_INITIAL_BALANCE ) }, - // for second Pendulum instance used for transferring native token - ParachainType::Pendulum2 => { - use pendulum_runtime::{Runtime, System}; + ParachainType::Amplitude => { + use amplitude_runtime::{Runtime, System}; build_parachain_with_orml!( self, Runtime, @@ -251,8 +248,8 @@ impl Builder for ExtBuilderParachain { ORML_INITIAL_BALANCE ) }, - ParachainType::Amplitude => { - use amplitude_runtime::{Runtime, System}; + ParachainType::Sibling => { + use pendulum_runtime::{Runtime, System}; build_parachain_with_orml!( self, Runtime, diff --git a/runtime/integration-tests/src/sibling.rs b/runtime/integration-tests/src/sibling.rs index 87576a6d3..16d57d299 100644 --- a/runtime/integration-tests/src/sibling.rs +++ b/runtime/integration-tests/src/sibling.rs @@ -197,12 +197,10 @@ pub type Amount = i128; impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type BlockWeights = (); @@ -230,10 +228,6 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = ConstU32<50>; type ReserveIdentifier = [u8; 8]; - type RuntimeHoldReason = RuntimeHoldReason; - type FreezeIdentifier = [u8; 8]; - type MaxHolds = (); - type MaxFreezes = (); } parameter_type_with_key! { @@ -394,9 +388,6 @@ impl pallet_xcm::Config for Runtime { type SovereignAccountOf = (); type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; - type AdminOrigin = EnsureRoot; - type MaxRemoteLockConsumers = ConstU32<0>; - type RemoteLockConsumerIdentifier = (); #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; }