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

[stable2407] Backport #7322 #7331

Closed
wants to merge 1 commit into from
Closed

[stable2407] Backport #7322 #7331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cumulus/parachains/integration-tests/emulated/common/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ macro_rules! test_dry_run_transfer_across_pk_bridge {
let transfer_amount = 10_000_000_000_000u128;
let initial_balance = transfer_amount * 10;

// Bridge setup.
// AssetHub setup.
$sender_asset_hub::force_xcm_version($destination, XCM_VERSION);

<$sender_asset_hub as TestExt>::execute_with(|| {
Expand Down
4 changes: 4 additions & 0 deletions ...us/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ pub(crate) fn bridged_roc_at_ah_westend() -> Location {
Location::new(2, [GlobalConsensus(Rococo)])
}

<<<<<<< HEAD
// wWND
=======
// WND and wWND
>>>>>>> 7710483 (Bridges: emulated tests small nits/improvements (#7322))
pub(crate) fn bridged_wnd_at_ah_rococo() -> Location {
Location::new(2, [GlobalConsensus(Westend)])
}
Expand Down
11 changes: 11 additions & 0 deletions ...rachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/send_xcm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,17 @@ fn send_xcm_through_opened_lane_with_different_xcm_version_on_hops_works() {
// fund sender
AssetHubRococo::fund_accounts(vec![(AssetHubRococoSender::get().into(), amount * 10)]);

<<<<<<< HEAD
=======
// Initially set only default version on all runtimes
let newer_xcm_version = xcm::prelude::XCM_VERSION;
let older_xcm_version = newer_xcm_version - 1;
AssetHubRococo::force_default_xcm_version(Some(older_xcm_version));
BridgeHubRococo::force_default_xcm_version(Some(older_xcm_version));
BridgeHubWestend::force_default_xcm_version(Some(older_xcm_version));
AssetHubWestend::force_default_xcm_version(Some(older_xcm_version));

>>>>>>> 7710483 (Bridges: emulated tests small nits/improvements (#7322))
// send XCM from AssetHubRococo - fails - destination version not known
assert_err!(
send_assets_from_asset_hub_rococo(
Expand Down
4 changes: 4 additions & 0 deletions ...s/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ pub(crate) fn bridged_wnd_at_ah_rococo() -> Location {
Location::new(2, [GlobalConsensus(Westend)])
}

<<<<<<< HEAD
// wROC
=======
// ROC and wROC
>>>>>>> 7710483 (Bridges: emulated tests small nits/improvements (#7322))
pub(crate) fn bridged_roc_at_ah_westend() -> Location {
Location::new(2, [GlobalConsensus(Rococo)])
}
Expand Down
11 changes: 11 additions & 0 deletions ...achains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/send_xcm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,17 @@ fn send_xcm_through_opened_lane_with_different_xcm_version_on_hops_works() {
// fund sender
AssetHubWestend::fund_accounts(vec![(AssetHubWestendSender::get().into(), amount * 10)]);

<<<<<<< HEAD
=======
// Initially set only default version on all runtimes
let newer_xcm_version = xcm::prelude::XCM_VERSION;
let older_xcm_version = newer_xcm_version - 1;
AssetHubRococo::force_default_xcm_version(Some(older_xcm_version));
BridgeHubRococo::force_default_xcm_version(Some(older_xcm_version));
BridgeHubWestend::force_default_xcm_version(Some(older_xcm_version));
AssetHubWestend::force_default_xcm_version(Some(older_xcm_version));

>>>>>>> 7710483 (Bridges: emulated tests small nits/improvements (#7322))
// send XCM from AssetHubWestend - fails - destination version not known
assert_err!(
send_assets_from_asset_hub_westend(
Expand Down
8 changes: 8 additions & 0 deletions prdoc/pr_7322.prdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
title: 'Bridges: emulated tests small nits/improvements'
doc:
- audience: Runtime Dev
description: |-
This PR removes the use of `open_bridge_between_asset_hub_rococo_and_asset_hub_westend`. This function was used in the generic `test_dry_run_transfer_across_pk_bridge` macro, which could cause compilation issues when used in other contexts (e.g. fellows repo).
crates:
- name: emulated-integration-tests-common
bump: patch
Loading