diff --git a/bridges/modules/xcm-bridge-router/src/impls.rs b/bridges/modules/xcm-bridge-router/src/impls.rs index 7af9a608fb5a4..d7ba3bbc6b5e0 100644 --- a/bridges/modules/xcm-bridge-router/src/impls.rs +++ b/bridges/modules/xcm-bridge-router/src/impls.rs @@ -74,9 +74,9 @@ impl, I: 'static> bp_xcm_bridge::LocalXcmChannelManager(PhantomData<(T, I, E, BNF, BHLF)>); +pub struct ViaRemoteBridgeExporter(PhantomData<(T, I, E, BNF, BHLF)>); impl, I: 'static, E, BridgedNetworkIdFilter, BridgeHubLocationFilter> ExporterFor - for ViaRemoteBridgeHubExporter + for ViaRemoteBridgeExporter where E: ExporterFor, BridgedNetworkIdFilter: Get>, @@ -193,8 +193,8 @@ where /// supports routing. This adapter can be used, for example, as a wrapper over /// [`xcm_builder::LocalExporter`], enabling it to compute message and/or dynamic fees using a /// fee factor. -pub struct ViaLocalBridgeHubExporter(PhantomData<(T, I, E)>); -impl, I: 'static, E: SendXcm> SendXcm for ViaLocalBridgeHubExporter { +pub struct ViaLocalBridgeExporter(PhantomData<(T, I, E)>); +impl, I: 'static, E: SendXcm> SendXcm for ViaLocalBridgeExporter { type Ticket = E::Ticket; fn validate( diff --git a/bridges/modules/xcm-bridge-router/src/lib.rs b/bridges/modules/xcm-bridge-router/src/lib.rs index b23cfddd4d6e7..7a99b0b44898b 100644 --- a/bridges/modules/xcm-bridge-router/src/lib.rs +++ b/bridges/modules/xcm-bridge-router/src/lib.rs @@ -39,8 +39,8 @@ //! //! ## Usage //! -//! This pallet provides several implementations, such as `ViaLocalBridgeHubExporter` and -//! `ViaRemoteBridgeHubExporter`, which can expose or access these features. +//! This pallet provides several implementations, such as `ViaLocalBridgeExporter` and +//! `ViaRemoteBridgeExporter`, which can expose or access these features. //! //! This router can be used in two main scenarios, depending on where the router and message //! exporter (e.g., `pallet_xcm_bridge_hub` or another pallet with an `ExportXcm` implementation) @@ -48,12 +48,12 @@ //! //! ### On the Same Chain as the Message Exporter //! In this setup, the router directly calls an `ExportXcm` implementation. In this case, -//! `ViaLocalBridgeHubExporter` can be used as a wrapper with `T::MessageExporter`. +//! `ViaLocalBridgeExporter` can be used as a wrapper with `T::MessageExporter`. //! //! ### On a Different Chain than the Message Exporter //! In this setup, we need to provide a `SendXcm` implementation for `T::MessageExporter`, which //! sends `ExportMessage`. For example, `SovereignPaidRemoteExporter` can be used with -//! `ViaRemoteBridgeHubExporter`. +//! `ViaRemoteBridgeExporter`. //! //! **Note on Terminology**: When we refer to the bridge hub, we mean the chain that has the //! `pallet-bridge-messages` with an `ExportXcm` implementation deployed, such as diff --git a/bridges/modules/xcm-bridge-router/src/mock.rs b/bridges/modules/xcm-bridge-router/src/mock.rs index c5d8a6eac019b..4633f359de58c 100644 --- a/bridges/modules/xcm-bridge-router/src/mock.rs +++ b/bridges/modules/xcm-bridge-router/src/mock.rs @@ -99,7 +99,7 @@ impl pallet_xcm_bridge_router::Config<()> for TestRuntime { LatestOrNoneForLocationVersionChecker>; type MessageExporter = SovereignPaidRemoteExporter< - pallet_xcm_bridge_router::impls::ViaRemoteBridgeHubExporter< + pallet_xcm_bridge_router::impls::ViaRemoteBridgeExporter< TestRuntime, (), NetworkExportTable, diff --git a/bridges/modules/xcm-bridge/src/mock.rs b/bridges/modules/xcm-bridge/src/mock.rs index c2d657c71949e..0790604b04fe6 100644 --- a/bridges/modules/xcm-bridge/src/mock.rs +++ b/bridges/modules/xcm-bridge/src/mock.rs @@ -256,7 +256,7 @@ impl pallet_xcm_bridge_router::Config` (), @@ -283,9 +283,9 @@ impl pallet_xcm_bridge_router::Config for TestRuntime { - // We use `LocalExporter` with `ViaLocalBridgeHubExporter` here to test and ensure that + // We use `LocalExporter` with `ViaLocalBridgeExporter` here to test and ensure that // `pallet_xcm_bridge_hub_router` can trigger directly `pallet_xcm_bridge_hub` as exporter. - type MessageExporter = pallet_xcm_bridge_router::impls::ViaLocalBridgeHubExporter< + type MessageExporter = pallet_xcm_bridge_router::impls::ViaLocalBridgeExporter< TestRuntime, XcmOverBridgeByExportXcmRouterInstance, LocalExporter, diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs index 32f5c988418fe..efa13901d268c 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs @@ -1000,7 +1000,7 @@ impl pallet_xcm_bridge_router::Config for Runtime { // BridgeHub. type MessageExporter = SovereignPaidRemoteExporter< // `ExporterFor` wrapper handling dynamic fees for congestion. - pallet_xcm_bridge_router::impls::ViaRemoteBridgeHubExporter< + pallet_xcm_bridge_router::impls::ViaRemoteBridgeExporter< Runtime, ToWestendXcmRouterInstance, NetworkExportTable, diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index 4f9356a1ed3d2..851f621caba95 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -1047,7 +1047,7 @@ impl pallet_xcm_bridge_router::Config for Runtime { // BridgeHub. type MessageExporter = SovereignPaidRemoteExporter< // `ExporterFor` wrapper handling dynamic fees for congestion. - pallet_xcm_bridge_router::impls::ViaRemoteBridgeHubExporter< + pallet_xcm_bridge_router::impls::ViaRemoteBridgeExporter< Runtime, ToRococoXcmRouterInstance, NetworkExportTable,