fixes related to pr comments

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

@@ -887,7 +887,7 @@ impl pallet_xcm_bridge_hub_router::Config<ToWestendXcmRouterInstance> for Runtim
 
 /// XCM router instance to BridgeHub with bridging capabilities for `Ethereum` global
 /// consensus with dynamic fees and back-pressure.
-pub type ToEthereumXcmRouterInstance = pallet_assets::Instance4;
+pub type ToEthereumXcmRouterInstance = pallet_xcm_bridge_hub_router::Instance4;
 impl pallet_xcm_bridge_hub_router::Config<ToEthereumXcmRouterInstance> for Runtime {
 	type WeightInfo = weights::pallet_xcm_bridge_hub_router::WeightInfo<Runtime>;
 

cumulus/parachains/runtimes/assets/common/src/matching.rs

@@ -59,9 +59,9 @@ impl<SelfParaId: Get<ParaId>> ContainsPair<MultiLocation, MultiLocation>
 	}
 }
 
-pub struct FromNetwork<SelfNetworkId>(sp_std::marker::PhantomData<SelfNetworkId>);
-impl<SelfNetworkId: Get<NetworkId>> ContainsPair<MultiLocation, MultiLocation>
-	for FromNetwork<SelfNetworkId>
+pub struct FromNetwork<ExpectedNetworkId>(sp_std::marker::PhantomData<ExpectedNetworkId>);
+impl<ExpectedNetworkId: Get<NetworkId>> ContainsPair<MultiLocation, MultiLocation>
+	for FromNetwork<ExpectedNetworkId>
 {
 	fn contains(&a: &MultiLocation, b: &MultiLocation) -> bool {
 		// `a` needs to be from `b` at least
@@ -71,7 +71,7 @@ impl<SelfNetworkId: Get<NetworkId>> ContainsPair<MultiLocation, MultiLocation>
 
 		match a {
 			MultiLocation { parents: 2, interior } => {
-				matches!(interior.first(), Some(GlobalConsensus(network)) if *network == SelfNetworkId::get())
+				matches!(interior.first(), Some(GlobalConsensus(network)) if *network == ExpectedNetworkId::get())
 			},
 			_ => false,
 		}

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_ethereum_config.rs

@@ -0,0 +1,9 @@
+use snowbridge_router_primitives::outbound::EthereumBlobExporter;
+use xcm_config::{AgentIdOf, EthereumNetwork, UniversalLocation};
+
+pub type SnowbridgeExporter = EthereumBlobExporter<
+	UniversalLocation,
+	EthereumNetwork,
+	snowbridge_outbound_queue::Pallet<Runtime>,
+	AgentIdOf,
+>;

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs

@@ -19,7 +19,6 @@
 use crate::{
 	bridge_common_config::{BridgeParachainWestendInstance, DeliveryRewardInBalance},
 	weights,
-	xcm_config::{AgentIdOf, EthereumNetwork, UniversalLocation},
 	AccountId, BridgeWestendMessages, ParachainInfo, Runtime, RuntimeEvent, RuntimeOrigin,
 	XcmRouter,
 };
@@ -40,7 +39,6 @@ use bridge_runtime_common::{
 		RefundableMessagesLane, RefundableParachain,
 	},
 };
-use snowbridge_router_primitives::outbound::EthereumBlobExporter;
 
 use codec::Encode;
 use frame_support::{parameter_types, traits::PalletInfoAccess};
@@ -119,13 +117,6 @@ pub type ToBridgeHubWestendHaulBlobExporter = HaulBlobExporter<
 	(),
 >;
 
-pub type SnowbridgeExporter = EthereumBlobExporter<
-	UniversalLocation,
-	EthereumNetwork,
-	snowbridge_outbound_queue::Pallet<Runtime>,
-	AgentIdOf,
->;
-
 pub struct ToBridgeHubWestendXcmBlobHauler;
 impl XcmBlobHauler for ToBridgeHubWestendXcmBlobHauler {
 	type Runtime = Runtime;

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -28,6 +28,7 @@
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 pub mod bridge_common_config;
+pub mod bridge_to_ethereum_config;
 pub mod bridge_to_westend_config;
 mod weights;
 pub mod xcm_config;