BridgeHubRococoUniversalLocation -> UniversalLocation

paritytech · Dec 14, 2023 · dfdda4c · bkontur · Dec 14, 2023 · dfdda4c
1 parent dff793d
commit dfdda4c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_common_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_common_config.rs
@@ -44,11 +44,6 @@ parameter_types! {
 	pub const RelayerStakeReserveId: [u8; 8] = *b"brdgrlrs";
 
 	pub storage DeliveryRewardInBalance: u64 = 1_000_000;
-
-	pub BridgeHubRococoUniversalLocation: InteriorMultiLocation = X2(
-		GlobalConsensus(Rococo),
-		Parachain(ParachainInfo::parachain_id().into()),
-	);
 }
 
 /// Add GRANDPA bridge pallet to track Westend relay chain.

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_bulletin_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_bulletin_config.rs
@@ -20,11 +20,11 @@
 //! are reusing Polkadot Bulletin chain primitives everywhere here.
 
 use crate::{
-	bridge_common_config::{
-		BridgeGrandpaRococoBulletinInstance, BridgeHubRococo, BridgeHubRococoUniversalLocation,
-	},
-	weights, AccountId, BridgeRococoBulletinGrandpa, BridgeRococoBulletinMessages, Runtime,
-	RuntimeEvent, XcmRouter,
+	bridge_common_config::{BridgeGrandpaRococoBulletinInstance, BridgeHubRococo},
+	weights,
+	xcm_config::UniversalLocation,
+	AccountId, BridgeRococoBulletinGrandpa, BridgeRococoBulletinMessages, Runtime, RuntimeEvent,
+	XcmRouter,
 };
 use bp_messages::LaneId;
 use bridge_runtime_common::{
@@ -59,7 +59,7 @@ parameter_types! {
 	pub const MaxUnrewardedRelayerEntriesAtInboundLane: bp_messages::MessageNonce =
 		bp_polkadot_bulletin::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX;
 	/// Maximal number of unconfirmed messages at the Rococo Bridge Hub. It matches the maximal number of
-	/// unconfirmed messages that the single confirmation transaction at Rococo Bulletin Chain may process.
+	/// uncinfirmed messages that the single confirmation transaction at Rococo Bulletin Chain may process.
 	pub const MaxUnconfirmedMessagesAtInboundLane: bp_messages::MessageNonce =
 		bp_polkadot_bulletin::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
 	/// Bridge specific chain (network) identifier of the Rococo Bulletin Chain.
@@ -107,7 +107,7 @@ pub type ToRococoBulletinMessagesDeliveryProof =
 /// Dispatches received XCM messages from other bridge.
 type FromRococoBulletinMessageBlobDispatcher = BridgeBlobDispatcher<
 	XcmRouter,
-	BridgeHubRococoUniversalLocation,
+	UniversalLocation,
 	BridgeRococoToRococoBulletinMessagesPalletInstance,
 >;
 

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs
@@ -18,10 +18,11 @@
 
 use crate::{
 	bridge_common_config::{
-		BridgeHubRococo, BridgeHubRococoUniversalLocation, BridgeParachainWestendInstance,
-		DeliveryRewardInBalance,
+		BridgeHubRococo, BridgeParachainWestendInstance, DeliveryRewardInBalance,
 	},
-	weights, AccountId, BridgeWestendMessages, Runtime, RuntimeEvent, XcmRouter,
+	weights,
+	xcm_config::UniversalLocation,
+	AccountId, BridgeWestendMessages, Runtime, RuntimeEvent, XcmRouter,
 };
 use bp_messages::LaneId;
 use bridge_runtime_common::{
@@ -104,11 +105,8 @@ pub type ToWestendBridgeHubMessagesDeliveryProof =
 	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_westend::Hash>;
 
 /// Dispatches received XCM messages from other bridge
-type FromWestendMessageBlobDispatcher = BridgeBlobDispatcher<
-	XcmRouter,
-	BridgeHubRococoUniversalLocation,
-	BridgeRococoToWestendMessagesPalletInstance,
->;
+type FromWestendMessageBlobDispatcher =
+	BridgeBlobDispatcher<XcmRouter, UniversalLocation, BridgeRococoToWestendMessagesPalletInstance>;
 
 /// Export XCM messages to be relayed to the other side
 pub type ToBridgeHubWestendHaulBlobExporter = HaulBlobExporter<