Skip to content

Bridges: Fix - Improve try-state for pallet-xcm-bridge-hub #8615

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

Merged
rosarp merged 10 commits into from
May 26, 2025
Merged

Bridges: Fix - Improve try-state for pallet-xcm-bridge-hub #8615

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8915472
rosarp May 22, 2025
440443c
Merge branch 'master' into rs-bridges-try-state-fixes
bkontur May 22, 2025
2795933
Update from github-actions[bot] running command 'fmt'
github-actions[bot] May 22, 2025
b9c033a
Update bridges/modules/xcm-bridge-hub/src/exporter.rs
bkontur May 22, 2025
dbbbe27
Merge branch 'master' into rs-bridges-try-state-fixes
bkontur May 22, 2025
9e2eccc
Update from github-actions[bot] running command 'prdoc --audience run…
github-actions[bot] May 23, 2025
e8abe14
Update prdoc/pr_8615.prdoc
bkontur May 23, 2025
0fa77e4
updated prdoc
rosarp May 23, 2025
9291e5e
Merge remote-tracking branch 'refs/remotes/origin/rs-bridges-try-stat…
rosarp May 23, 2025
54d919a
Merge branch 'master' into rs-bridges-try-state-fixes
bkontur May 26, 2025
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 bridges/modules/xcm-bridge-hub/src/dispatcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ where

fn is_active(lane: Self::LaneId) -> bool {
Pallet::<T, I>::bridge_by_lane_id(&lane)
.and_then(|(_, bridge)| bridge.bridge_origin_relative_location.try_as().cloned().ok())
.and_then(|(_, bridge)| (*bridge.bridge_origin_relative_location).try_into().ok())
.map(|recipient: Location| !T::LocalXcmChannelManager::is_congested(&recipient))
.unwrap_or(false)
}
Expand Down
7 changes: 4 additions & 3 deletions bridges/modules/xcm-bridge-hub/src/exporter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,16 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
}

// else - suspend the bridge
let bridge_origin_relative_location = match bridge.bridge_origin_relative_location.try_as()
{
let result_bridge_origin_relative_location =
(*bridge.bridge_origin_relative_location).clone().try_into();
let bridge_origin_relative_location = match &result_bridge_origin_relative_location {
Ok(bridge_origin_relative_location) => bridge_origin_relative_location,
Err(_) => {
log::debug!(
target: LOG_TARGET,
"Failed to convert the bridge {:?} origin location {:?}",
bridge_id,
bridge.bridge_origin_relative_location,
bridge.bridge_origin_relative_location.clone(),
);

return
Expand Down
Loading