xcm-emulator: move bridge tests under per-bridge crate

acatangiu · Nov 9, 2023 · 942092f · 942092f
1 parent c5265e7
commit 942092f
Show file tree

Hide file tree

Showing 12 changed files with 144 additions and 298 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -67,8 +67,7 @@ members = [
 	"cumulus/parachains/common",
 	"cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo",
 	"cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend",
-	"cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo",
-	"cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend",
+	"cumulus/parachains/integration-tests/emulated/tests/bridges/rococo-westend",
 	"cumulus/parachains/integration-tests/emulated/common",
 	"cumulus/parachains/integration-tests/emulated/chains/relays/rococo",
 	"cumulus/parachains/integration-tests/emulated/chains/relays/westend",

diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
diff --git a/...arachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/example.rs b/...arachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/example.rs
diff --git a/...us/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/mod.rs b/...us/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/mod.rs
diff --git a/...rachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/teleport.rs b/...rachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/teleport.rs
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/lib.rs
diff --git a/...sts/bridges/bridge-hub-westend/Cargo.toml → ...d/tests/bridges/rococo-westend/Cargo.toml b/...sts/bridges/bridge-hub-westend/Cargo.toml → ...d/tests/bridges/rococo-westend/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "bridge-hub-westend-integration-tests"
+name = "rococo-westend-bridge-integration-tests"
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
-description = "Bridge Hub Westend runtime integration tests with xcm-emulator"
+description = "Rococo<>Westend bridge integration tests with xcm-emulator"
 publish = false
 
 [dependencies]
@@ -28,6 +28,7 @@ asset-test-utils = { path = "../../../../../../parachains/runtimes/assets/test-u
 parachains-common = { path = "../../../../../../parachains/common" }
 cumulus-pallet-xcmp-queue = { path = "../../../../../../pallets/xcmp-queue", default-features = false}
 cumulus-pallet-dmp-queue = { path = "../../../../../../pallets/dmp-queue", default-features = false}
+bridge-hub-rococo-runtime = { path = "../../../../../../parachains/runtimes/bridge-hubs/bridge-hub-rococo", default-features = false }
 bridge-hub-westend-runtime = { path = "../../../../../../parachains/runtimes/bridge-hubs/bridge-hub-westend", default-features = false }
 emulated-integration-tests-common = { path = "../../../common", default-features = false}
 rococo-westend-system-emulated-network = { path = "../../../networks/rococo-westend-system" }
diff --git a/...ests/bridges/bridge-hub-rococo/src/lib.rs → ...d/tests/bridges/rococo-westend/src/lib.rs b/...ests/bridges/bridge-hub-rococo/src/lib.rs → ...d/tests/bridges/rococo-westend/src/lib.rs
@@ -43,13 +43,22 @@ pub use rococo_westend_system_emulated_network::{
 	bridge_hub_rococo_emulated_chain::{
 		genesis::ED as BRIDGE_HUB_ROCOCO_ED, BridgeHubRococoParaPallet as BridgeHubRococoPallet,
 	},
+	bridge_hub_westend_emulated_chain::{
+		genesis::ED as BRIDGE_HUB_WESTEND_ED, BridgeHubWestendParaPallet as BridgeHubWestendPallet,
+	},
 	rococo_emulated_chain::{genesis::ED as ROCOCO_ED, RococoRelayPallet as RococoPallet},
+	westend_emulated_chain::{genesis::ED as WESTEND_ED, WestendRelayPallet as WestendPallet},
 	AssetHubRococoPara as AssetHubRococo, AssetHubRococoParaReceiver as AssetHubRococoReceiver,
 	AssetHubRococoParaSender as AssetHubRococoSender, AssetHubWestendPara as AssetHubWestend,
-	BridgeHubRococoPara as BridgeHubRococo, BridgeHubRococoParaReceiver as BridgeHubRococoReceiver,
+	AssetHubWestendParaReceiver as AssetHubWestendReceiver,
+	AssetHubWestendParaSender as AssetHubWestendSender, BridgeHubRococoPara as BridgeHubRococo,
+	BridgeHubRococoParaReceiver as BridgeHubRococoReceiver,
 	BridgeHubRococoParaSender as BridgeHubRococoSender, BridgeHubWestendPara as BridgeHubWestend,
-	RococoRelay as Rococo, RococoRelayReceiver as RococoReceiver,
-	RococoRelaySender as RococoSender,
+	BridgeHubWestendParaReceiver as BridgeHubWestendReceiver,
+	BridgeHubWestendParaSender as BridgeHubWestendSender, RococoRelay as Rococo,
+	RococoRelayReceiver as RococoReceiver, RococoRelaySender as RococoSender,
+	WestendRelay as Westend, WestendRelayReceiver as WestendReceiver,
+	WestendRelaySender as WestendSender,
 };
 
 pub const ASSET_ID: u32 = 1;