xcm-emulator: add Rococo<>Westend bridge and add tests for assets tra…

…nsfers over the bridge (#2251) - switch from Rococo<>Wococo to Rococo<>Westend bridge - add bidirectional simple tests - remove Wococo chains from xcm-emulator - added tests for assets transfers over Rococo<>Westend bridge fixes paritytech/parity-bridges-common#2405
paritytech · Nov 14, 2023 · 39cc957 · 39cc957
1 parent a393cfc
commit 39cc957
Show file tree

Hide file tree

Showing 30 changed files with 710 additions and 468 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,16 +71,13 @@ members = [
 	"cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend",
 	"cumulus/parachains/integration-tests/emulated/common",
 	"cumulus/parachains/integration-tests/emulated/chains/relays/rococo",
-	"cumulus/parachains/integration-tests/emulated/chains/relays/wococo",
 	"cumulus/parachains/integration-tests/emulated/chains/relays/westend",
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo",
-	"cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo",
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend",
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo",
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend",
 	"cumulus/parachains/integration-tests/emulated/networks/rococo-system",
-	"cumulus/parachains/integration-tests/emulated/networks/wococo-system",
-	"cumulus/parachains/integration-tests/emulated/networks/rococo-wococo-system",
+    "cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system",
 	"cumulus/parachains/integration-tests/emulated/networks/westend-system",
 	"cumulus/parachains/pallets/collective-content",
 	"cumulus/parachains/pallets/parachain-info",

diff --git a/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs b/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs
@@ -21,7 +21,8 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	impl_assets_helpers_for_parachain, xcm_emulator::decl_test_parachains,
+	impl_assets_helpers_for_parachain, impl_foreign_assets_helpers_for_parachain, impls::Parachain,
+	xcm_emulator::decl_test_parachains,
 };
 use rococo_emulated_chain::Rococo;
 
@@ -53,3 +54,4 @@ decl_test_parachains! {
 impl_accounts_helpers_for_parachain!(AssetHubRococo);
 impl_assert_events_helpers_for_parachain!(AssetHubRococo, false);
 impl_assets_helpers_for_parachain!(AssetHubRococo, Rococo);
+impl_foreign_assets_helpers_for_parachain!(AssetHubRococo, Rococo);
diff --git a/...rachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs b/...rachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs
@@ -21,7 +21,8 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	impl_assets_helpers_for_parachain, xcm_emulator::decl_test_parachains,
+	impl_assets_helpers_for_parachain, impl_foreign_assets_helpers_for_parachain, impls::Parachain,
+	xcm_emulator::decl_test_parachains,
 };
 use westend_emulated_chain::Westend;
 
@@ -53,3 +54,4 @@ decl_test_parachains! {
 impl_accounts_helpers_for_parachain!(AssetHubWestend);
 impl_assert_events_helpers_for_parachain!(AssetHubWestend, false);
 impl_assets_helpers_for_parachain!(AssetHubWestend, Westend);
+impl_foreign_assets_helpers_for_parachain!(AssetHubWestend, Westend);
diff --git a/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/Cargo.toml b/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/Cargo.toml
diff --git a/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/src/lib.rs b/...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/src/lib.rs
diff --git a/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs b/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs
@@ -21,7 +21,7 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	xcm_emulator::decl_test_parachains,
+	impls::Parachain, xcm_emulator::decl_test_parachains,
 };
 
 // BridgeHubRococo Parachain declaration

diff --git a/...ns/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/genesis.rs b/...ns/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/genesis.rs
@@ -22,7 +22,7 @@ use emulated_integration_tests_common::{
 };
 use parachains_common::Balance;
 
-pub const PARA_ID: u32 = 1013;
+pub const PARA_ID: u32 = 1002;
 pub const ED: Balance = parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
 
 pub fn genesis() -> Storage {

diff --git a/...chains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs b/...chains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs
@@ -21,7 +21,7 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	xcm_emulator::decl_test_parachains,
+	impls::Parachain, xcm_emulator::decl_test_parachains,
 };
 
 // BridgeHubWestend Parachain declaration

diff --git a/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/Cargo.toml b/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/Cargo.toml
diff --git a/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/src/lib.rs b/...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/src/lib.rs
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs
@@ -22,7 +22,7 @@ use frame_support::traits::OnInitialize;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	impl_assets_helpers_for_parachain, xcm_emulator::decl_test_parachains,
+	impl_assets_helpers_for_parachain, impls::Parachain, xcm_emulator::decl_test_parachains,
 };
 use rococo_emulated_chain::Rococo;