Cleanup primitives/consts

bridges/chains/chain-asset-hub-rococo/Cargo.toml

@@ -14,20 +14,7 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-
-# Substrate Dependencies
-frame-support = { workspace = true }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
 
 [features]
 default = ["std"]
-std = [
-	"bp-xcm-bridge-hub-router/std",
-	"codec/std",
-	"frame-support/std",
-	"scale-info/std",
-]
+std = []

bridges/chains/chain-asset-hub-rococo/src/lib.rs

@@ -18,31 +18,5 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
-use scale_info::TypeInfo;
-
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
-
-/// `AssetHubRococo` Runtime `Call` enum.
-///
-/// The enum represents a subset of possible `Call`s we can send to `AssetHubRococo` chain.
-/// Ideally this code would be auto-generated from metadata, because we want to
-/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
-///
-/// All entries here (like pretty much in the entire file) must be kept in sync with
-/// `AssetHubRococo` `construct_runtime`, so that we maintain SCALE-compatibility.
-#[allow(clippy::large_enum_variant)]
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-pub enum Call {
-	/// `ToWestendXcmRouter` bridge pallet.
-	#[codec(index = 45)]
-	ToWestendXcmRouter(XcmBridgeHubRouterCall),
-}
-
-frame_support::parameter_types! {
-	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
-	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-}
-
 /// Identifier of AssetHubRococo in the Rococo relay chain.
 pub const ASSET_HUB_ROCOCO_PARACHAIN_ID: u32 = 1000;

bridges/chains/chain-asset-hub-westend/Cargo.toml

@@ -14,20 +14,7 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-
-# Substrate Dependencies
-frame-support = { workspace = true }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
 
 [features]
 default = ["std"]
-std = [
-	"bp-xcm-bridge-hub-router/std",
-	"codec/std",
-	"frame-support/std",
-	"scale-info/std",
-]
+std = []

bridges/chains/chain-asset-hub-westend/src/lib.rs

@@ -18,31 +18,5 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
-use scale_info::TypeInfo;
-
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
-
-/// `AssetHubWestend` Runtime `Call` enum.
-///
-/// The enum represents a subset of possible `Call`s we can send to `AssetHubWestend` chain.
-/// Ideally this code would be auto-generated from metadata, because we want to
-/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
-///
-/// All entries here (like pretty much in the entire file) must be kept in sync with
-/// `AssetHubWestend` `construct_runtime`, so that we maintain SCALE-compatibility.
-#[allow(clippy::large_enum_variant)]
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-pub enum Call {
-	/// `ToRococoXcmRouter` bridge pallet.
-	#[codec(index = 34)]
-	ToRococoXcmRouter(XcmBridgeHubRouterCall),
-}
-
-frame_support::parameter_types! {
-	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
-	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-}
-
 /// Identifier of AssetHubWestend in the Westend relay chain.
 pub const ASSET_HUB_WESTEND_PARACHAIN_ID: u32 = 1000;

bridges/chains/chain-bridge-hub-rococo/src/lib.rs

@@ -123,3 +123,9 @@ pub enum RuntimeCall {
 	#[codec(index = 52)]
 	XcmOverBridgeHubWestend(bp_xcm_bridge_hub::XcmBridgeHubCall),
 }
+
+// TODO: remove when xcm:v5
+frame_support::parameter_types! {
+	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
+	pub const XcmBridgeHubRouterTransactCallMaxWeight: Weight = Weight::from_parts(1_000_000_000, 1024*8);
+}

bridges/chains/chain-bridge-hub-westend/src/lib.rs

@@ -112,3 +112,9 @@ pub enum RuntimeCall {
 	#[codec(index = 45)]
 	XcmOverBridgeHubRococo(bp_xcm_bridge_hub::XcmBridgeHubCall),
 }
+
+// TODO: remove when xcm:v5
+frame_support::parameter_types! {
+	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
+	pub const XcmBridgeHubRouterTransactCallMaxWeight: Weight = Weight::from_parts(1_000_000_000, 1024*8);
+}

bridges/primitives/xcm-bridge-hub-router/src/lib.rs

@@ -20,7 +20,7 @@
 
 use codec::{Decode, Encode, FullCodec, MaxEncodedLen};
 use scale_info::TypeInfo;
-use sp_core::{H256, sp_std::fmt::Debug};
+use sp_core::sp_std::fmt::Debug;
 use sp_runtime::{FixedU128, RuntimeDebug};
 use xcm::latest::prelude::{Location, NetworkId, InteriorLocation};
 
@@ -56,12 +56,3 @@ impl ResolveBridgeId for () {
 		None
 	}
 }
-
-/// A minimized version of `pallet-xcm-bridge-hub-router::Call` that can be used without a runtime.
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-#[allow(non_camel_case_types)]
-pub enum XcmBridgeHubRouterCall {
-	/// `pallet-xcm-bridge-hub-router::Call::report_bridge_status`
-	#[codec(index = 0)]
-	report_bridge_status { bridge_id: H256, is_congested: bool },
-}