pallet-xcm: enhance reserve_transfer_assets to support remote reserves

cumulus/pallets/xcmp-queue/src/bridging.rs

@@ -55,7 +55,9 @@ impl<SiblingBridgeHubParaId: Get<ParaId>, Runtime: crate::Config>
 		let sibling_bridge_hub_id: ParaId = SiblingBridgeHubParaId::get();
 
 		// let's find the channel's state with the sibling parachain,
-		let Some((outbound_state, queued_pages)) = pallet::Pallet::<Runtime>::outbound_channel_state(sibling_bridge_hub_id) else {
+		let Some((outbound_state, queued_pages)) =
+			pallet::Pallet::<Runtime>::outbound_channel_state(sibling_bridge_hub_id)
+		else {
 			return false
 		};
 		// suspended channel => it is congested

cumulus/pallets/xcmp-queue/src/tests.rs

@@ -410,9 +410,11 @@ fn verify_fee_factor_increase_and_decrease() {
 		assert_eq!(DeliveryFeeFactor::<Test>::get(sibling_para_id), initial);
 
 		// Sending the message right now is cheap
-		let (_, delivery_fees) = validate_send::<XcmpQueue>(destination, xcm.clone())
-			.expect("message can be sent; qed");
-		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else { unreachable!("asset is fungible; qed"); };
+		let (_, delivery_fees) =
+			validate_send::<XcmpQueue>(destination, xcm.clone()).expect("message can be sent; qed");
+		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else {
+			unreachable!("asset is fungible; qed");
+		};
 		assert_eq!(delivery_fee_amount, 402_000_000);
 
 		let smaller_xcm = Xcm(vec![ClearOrigin; 30]);
@@ -422,19 +424,23 @@ fn verify_fee_factor_increase_and_decrease() {
 		assert_ok!(send_xcm::<XcmpQueue>(destination, xcm.clone())); // Size 520
 		assert_eq!(DeliveryFeeFactor::<Test>::get(sibling_para_id), FixedU128::from_float(1.05));
 
-		for _ in 0..12 { // We finish at size 929
+		for _ in 0..12 {
+			// We finish at size 929
 			assert_ok!(send_xcm::<XcmpQueue>(destination, smaller_xcm.clone()));
 		}
 		assert!(DeliveryFeeFactor::<Test>::get(sibling_para_id) > FixedU128::from_float(1.88));
 
 		// Sending the message right now is expensive
-		let (_, delivery_fees) = validate_send::<XcmpQueue>(destination, xcm.clone())
-			.expect("message can be sent; qed");
-		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else { unreachable!("asset is fungible; qed"); };
+		let (_, delivery_fees) =
+			validate_send::<XcmpQueue>(destination, xcm.clone()).expect("message can be sent; qed");
+		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else {
+			unreachable!("asset is fungible; qed");
+		};
 		assert_eq!(delivery_fee_amount, 758_030_955);
 
 		// Fee factor only decreases in `take_outbound_messages`
-		for _ in 0..5 { // We take 5 100 byte pages
+		for _ in 0..5 {
+			// We take 5 100 byte pages
 			XcmpQueue::take_outbound_messages(1);
 		}
 		assert!(DeliveryFeeFactor::<Test>::get(sibling_para_id) < FixedU128::from_float(1.72));

cumulus/parachain-template/runtime/src/xcm_config.rs

@@ -153,6 +153,13 @@ pub type XcmRouter = WithUniqueTopic<(
 #[cfg(feature = "runtime-benchmarks")]
 parameter_types! {
 	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
+	// Teleports are disabled
+	pub TeleportableAssets: Option<(MultiAssets, MultiLocation)> = None;
+	// We can reserve transfer relay/native token between us and Relay.
+	pub ReserveTransferableAssets: Option<(MultiAssets, MultiLocation)> = Some((
+		MultiAsset { fun: Fungible(10), id: Concrete(Parent.into()) }.into(),
+		Parent.into(),
+	));
 }
 
 impl pallet_xcm::Config for Runtime {
@@ -180,11 +187,15 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
+	#[cfg(feature = "runtime-benchmarks")]
+	type ReachableDest = ReachableDest;
+	#[cfg(feature = "runtime-benchmarks")]
+	type TeleportableAssets = TeleportableAssets;
+	#[cfg(feature = "runtime-benchmarks")]
+	type ReserveTransferableAssets = ReserveTransferableAssets;
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {