Add dependencies

pendulum-chain · Oct 31, 2023 · a946655 · a946655
1 parent 8f12d5a
commit a946655
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -115,8 +115,8 @@ pub enum ParachainType {
 	PolkadotAssetHub,
 	KusamaAssetHub,
 	Pendulum,
-	Pendulum2,
 	Amplitude,
+	Sibling,
 }
 
 pub struct ExtBuilderParachain<Currency> {
@@ -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<CurrencyId> {
 	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<CurrencyId> for ExtBuilderParachain<CurrencyId> {
@@ -240,9 +238,8 @@ impl Builder<CurrencyId> for ExtBuilderParachain<CurrencyId> {
 					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<CurrencyId> for ExtBuilderParachain<CurrencyId> {
 					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
@@ -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<Self::AccountId>;
-	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<AccountId>;
-	type MaxRemoteLockConsumers = ConstU32<0>;
-	type RemoteLockConsumerIdentifier = ();
 	#[cfg(feature = "runtime-benchmarks")]
 	type ReachableDest = ReachableDest;
 }