Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xcm-emulator: add Rococo<>Westend bridge and add tests for assets transfers over the bridge #2251

Merged
merged 11 commits into from
Nov 14, 2023
Merged

xcm-emulator: add Rococo<>Westend bridge and add tests for assets transfers over the bridge #2251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c228db2
xcm-emulator: switch from Rococo<>Wococo to Rococo<>Westend bridge an…
acatangiu Nov 9, 2023
c5265e7
xcm-emulator: remove wococo chains
acatangiu Nov 9, 2023
942092f
xcm-emulator: move bridge tests under per-bridge crate
acatangiu Nov 9, 2023
3daf65c
Revert "xcm-emulator: move bridge tests under per-bridge crate"
acatangiu Nov 13, 2023
8308f7e
xcm-emulator: add ROCs & WNDs transfers tests across R-W bridge
acatangiu Nov 13, 2023
255acf5
Merge branch 'master' of github.com:paritytech/polkadot-sdk into xcm-…
acatangiu Nov 13, 2023
4c730f9
Merge branch 'master' of github.com:paritytech/polkadot-sdk into xcm-…
acatangiu Nov 13, 2023
2824320
fix merge damage
acatangiu Nov 13, 2023
4a595c7
xcm-emulator: add foreign assets helpers to emulated/common
acatangiu Nov 13, 2023
9ca8e17
xcm-emulator: add bi-directional transfers of both ROCs & WNDs across…
acatangiu Nov 14, 2023
7e8a870
xcm-emulator: add reserve accounts checks to bridge asset transfer tests
acatangiu Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 10 additions & 68 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion ...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
4 changes: 3 additions & 1 deletion ...rachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
26 changes: 0 additions & 26 deletions ...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/Cargo.toml
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions ...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ns/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...chains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 0 additions & 25 deletions ...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/Cargo.toml
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions ...achains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading