Optimization by reusing NetworkExportTable

Author: yrong

bridges/snowbridge/primitives/router/src/outbound/mod.rs

@@ -21,7 +21,7 @@ use sp_core::{H160, H256};
 use sp_runtime::traits::MaybeEquivalence;
 use sp_std::{iter::Peekable, marker::PhantomData, prelude::*};
 use xcm::prelude::*;
-use xcm_builder::{ExporterFor, NetworkExportTableItem};
+use xcm_builder::{ExporterFor, NetworkExportTable, NetworkExportTableItem};
 use xcm_executor::traits::{ConvertLocation, ExportXcm};
 
 pub struct EthereumBlobExporter<
@@ -424,16 +424,11 @@ impl<T: Get<Vec<NetworkExportTableItem>>, M: Contains<Xcm<()>>> ExporterFor
 		remote_location: &InteriorLocation,
 		xcm: &Xcm<()>,
 	) -> Option<(Location, Option<Asset>)> {
-		T::get()
-			.into_iter()
-			.find(|item| {
-				&item.remote_network == network &&
-					M::contains(xcm) &&
-					item.remote_location_filter
-						.as_ref()
-						.map(|filters| filters.iter().any(|filter| filter == remote_location))
-						.unwrap_or(true)
-			})
-			.map(|item| (item.bridge, item.payment))
+		// check the XCM
+		if !M::contains(xcm) {
+			return None
+		}
+		// check `network` and `remote_location`
+		NetworkExportTable::<T>::exporter_for(network, remote_location, xcm)
 	}
 }

cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs

@@ -659,7 +659,7 @@ pub mod bridging {
 		use super::*;
 		use assets_common::matching::FromNetwork;
 		use core::ops::ControlFlow;
-		use frame_support::traits::{EverythingBut, ProcessMessageError};
+		use frame_support::traits::ProcessMessageError;
 		use sp_std::collections::btree_set::BTreeSet;
 		use testnet_parachains_constants::westend::snowbridge::{
 			EthereumNetwork, INBOUND_QUEUE_PALLET_INDEX,
@@ -734,7 +734,7 @@ pub mod bridging {
 					|_| true,
 					|inst| {
 						return match inst {
-							AliasOrigin(..) => Err(ProcessMessageError::Unsupported),
+							AliasOrigin(..) => Err(ProcessMessageError::Yield),
 							_ => Ok(ControlFlow::Continue(())),
 						}
 					},
@@ -749,11 +749,7 @@ pub mod bridging {
 				XcmForSnowbridgeV2,
 			>;
 
-		pub type EthereumNetworkExportTable =
-			snowbridge_router_primitives::outbound::NetworkWithXcmExportTable<
-				EthereumBridgeTable,
-				EverythingBut<XcmForSnowbridgeV2>,
-			>;
+		pub type EthereumNetworkExportTable = xcm_builder::NetworkExportTable<EthereumBridgeTable>;
 
 		pub type IsTrustedBridgedReserveLocationForForeignAsset =
 			IsForeignConcreteAsset<FromNetwork<UniversalLocation, EthereumNetwork>>;