Try to get sibling to compile for the minimal configuration - failed

pendulum-chain · Nov 2, 2023 · 0c2b587 · 0c2b587
1 parent a946655
commit 0c2b587
Show file tree

Hide file tree

Showing 5 changed files with 258 additions and 197 deletions.
diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml
@@ -8,6 +8,7 @@ version = "0.1.0"
 [dev-dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 scale-info = { version = "2.1.2", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
@@ -18,6 +19,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-
 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" }
+sp-debug-derive = { 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" }

diff --git a/runtime/integration-tests/src/lib.rs b/runtime/integration-tests/src/lib.rs
@@ -10,6 +10,7 @@ mod amplitude_tests;
 #[cfg(test)]
 mod test_macros;
 
+#[cfg(test)]
 mod sibling;
 
 pub const PENDULUM_ID: u32 = 2094;

diff --git a/runtime/integration-tests/src/mock.rs b/runtime/integration-tests/src/mock.rs
@@ -199,7 +199,7 @@ impl<Currency> ExtBuilderParachain<Currency> {
 			ParachainType::PolkadotAssetHub => POLKADOT_ASSETHUB_ID,
 			ParachainType::KusamaAssetHub => KUSAMA_ASSETHUB_ID,
 			ParachainType::Pendulum => PENDULUM_ID,
-			ParachainType::Pendulum2 => PENDULUM_ID + 1,
+			ParachainType::Sibling => PENDULUM_ID + 1,
 			ParachainType::Amplitude => AMPLITUDE_ID,
 		}
 	}

diff --git a/runtime/integration-tests/src/pendulum_tests.rs b/runtime/integration-tests/src/pendulum_tests.rs
@@ -36,12 +36,12 @@ decl_test_parachain! {
 }
 
 decl_test_parachain! {
-	pub struct Pendulum2Parachain {
+	pub struct SiblingParachain {
 		Runtime = pendulum_runtime::Runtime,
 		RuntimeOrigin = pendulum_runtime::RuntimeOrigin,
 		XcmpMessageHandler = pendulum_runtime::XcmpQueue,
 		DmpMessageHandler = pendulum_runtime::DmpQueue,
-		new_ext = para_ext(ParachainType::Pendulum2),
+		new_ext = para_ext(ParachainType::Sibling),
 	}
 }
 
@@ -61,7 +61,7 @@ decl_test_network! {
 		parachains = vec![
 			(1000, AssetHubParachain),
 			(2094, PendulumParachain),
-			(2095, Pendulum2Parachain),
+			(2095, SiblingParachain),
 		],
 	}
 }
@@ -132,15 +132,15 @@ fn assethub_transfer_asset_to_pendulum_and_back() {
 #[test]
 fn transfer_pendulum_native_token_to_pendulum() {
 	// ID for Pendulum's second instance
-	pub const PENDULUM2_ID: u32 = PENDULUM_ID + 1;
+	pub const SIBLING_ID: u32 = PENDULUM_ID + 1;
 
 	transfer_native_token_from_parachain1_to_parachain2!(
 		PolkadotMockNet,
 		pendulum_runtime,
 		PendulumParachain,
 		pendulum_runtime,
-		Pendulum2Parachain,
+		SiblingParachain,
 		PENDULUM_ID,
-		PENDULUM2_ID
+		SIBLING_ID
 	);
 }