fix(integration-tests): handle delivery_fees only with mainnet feature on

fmt after rebase

fmt

Author: al3mart

integration-tests/src/lib.rs

@@ -22,6 +22,9 @@ use emulated_integration_tests_common::{
 };
 use frame_support::{pallet_prelude::Weight, sp_runtime::DispatchResult};
 use pop_runtime_common::Balance;
+#[cfg(not(feature = "mainnet"))]
+use pop_runtime_devnet::config::xcm::XcmConfig as PopNetworkXcmConfig;
+#[cfg(feature = "mainnet")]
 use pop_runtime_mainnet::config::xcm::XcmConfig as PopNetworkXcmConfig;
 use xcm::prelude::*;
 
@@ -318,11 +321,15 @@ fn reserve_transfer_native_asset_from_para_to_system_para() {
 	let delivery_fees = PopNetworkPara::execute_with(|| {
 		xcm_helpers::teleport_assets_delivery_fees::<
 			<PopNetworkXcmConfig as xcm_executor::Config>::XcmSender,
-		>(assets, 0, Unlimited, Location::from(beneficiary_id.clone()), destination.clone())
+		>(
+			assets.clone(), 0, Unlimited, Location::from(beneficiary_id.clone()), destination.clone()
+		)
 	});
-
+	#[cfg(feature = "mainnet")]
 	let amount_to_send = amount_to_send - (ASSET_HUB_ED + delivery_fees);
+	#[cfg(feature = "mainnet")]
 	let assets: Assets = (Parent, amount_to_send).into();
+
 	let test_args = TestContext {
 		sender: PopNetworkParaReceiver::get(), // bob on pop
 		receiver: AssetHubParaReceiver::get(), // bob on asset hub
@@ -352,6 +359,7 @@ fn reserve_transfer_native_asset_from_para_to_system_para() {
 	// Sender's balance is reduced
 	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
 	// Sender's balance is the remaining ED.
+	#[cfg(feature = "mainnet")]
 	assert_eq!(ASSET_HUB_ED, sender_balance_after);
 	// Receiver's balance is increased
 	assert!(receiver_balance_after > receiver_balance_before);

runtime/mainnet/src/config/xcm.rs

@@ -276,9 +276,6 @@ mod tests {
 	use sp_runtime::FixedPointNumber;
 
 	use super::*;
-
-	mod reserves_config {
-		use super::*;
 	use crate::System;
 
 	fn new_test_ext() -> sp_io::TestExternalities {
@@ -287,6 +284,9 @@ mod tests {
 		ext
 	}
 
+	mod reserves_config {
+		use super::*;
+
 		// Only reserve accepted is the relay asset from Asset Hub.
 		#[test]
 		fn reserves() {
@@ -872,13 +872,13 @@ mod tests {
 			);
 		}
 
-	#[test]
-	fn reserve_transfer_filter_only_allows_dot_from_ah() {
-		assert_eq!(
-			TypeId::of::<<Runtime as pallet_xcm::Config>::XcmReserveTransferFilter>(),
-			TypeId::of::<NativeAssetFrom<AssetHub>>(),
-		);
-	}
+		#[test]
+		fn reserve_transfer_filter_only_allows_dot_from_ah() {
+			assert_eq!(
+				TypeId::of::<<Runtime as pallet_xcm::Config>::XcmReserveTransferFilter>(),
+				TypeId::of::<Everything>(),
+			);
+		}
 
 		#[test]
 		fn router_uses_ump_for_relay_and_xcmp_for_para() {
@@ -964,36 +964,37 @@ mod tests {
 			);
 		}
 
-	#[test]
-	fn price_for_sibling_delivery() {
-		assert_eq!(
-			TypeId::of::<<Runtime as cumulus_pallet_xcmp_queue::Config>::PriceForSiblingDelivery>(),
-			TypeId::of::<
-				ExponentialPrice<RelayLocation, BaseDeliveryFee, TransactionByteFee, XcmpQueue>,
-			>()
-		);
-
-		new_test_ext().execute_with(|| {
-			type ExponentialDeliveryPrice =
-				ExponentialPrice<RelayLocation, BaseDeliveryFee, TransactionByteFee, XcmpQueue>;
-			let id: ParaId = 420.into();
-			let b: u128 = BaseDeliveryFee::get();
-			let m: u128 = TransactionByteFee::get();
-
-			// F * (B + msg_length * M)
-			// A: RelayLocation
-			// B: BaseDeliveryFee
-			// M: TransactionByteFee
-			// F: XcmpQueue
-			//
-			// message_length = 1
-			let result: u128 = XcmpQueue::get_fee_factor(id).saturating_mul_int(b + m);
-			assert_eq!(
-				ExponentialDeliveryPrice::price_for_delivery(id, &Xcm(vec![])),
-				(RelayLocation::get(), result).into()
-			);
-		})
-	}
+		#[test]
+		fn price_for_sibling_delivery() {
+			assert_eq!(
+				TypeId::of::<<Runtime as cumulus_pallet_xcmp_queue::Config>::PriceForSiblingDelivery>(
+				),
+				TypeId::of::<
+					ExponentialPrice<RelayLocation, BaseDeliveryFee, TransactionByteFee, XcmpQueue>,
+				>()
+			);
+
+			new_test_ext().execute_with(|| {
+				type ExponentialDeliveryPrice =
+					ExponentialPrice<RelayLocation, BaseDeliveryFee, TransactionByteFee, XcmpQueue>;
+				let id: ParaId = 420.into();
+				let b: u128 = BaseDeliveryFee::get();
+				let m: u128 = TransactionByteFee::get();
+
+				// F * (B + msg_length * M)
+				// A: RelayLocation
+				// B: BaseDeliveryFee
+				// M: TransactionByteFee
+				// F: XcmpQueue
+				//
+				// message_length = 1
+				let result: u128 = XcmpQueue::get_fee_factor(id).saturating_mul_int(b + m);
+				assert_eq!(
+					ExponentialDeliveryPrice::price_for_delivery(id, &Xcm(vec![])),
+					(RelayLocation::get(), result).into()
+				);
+			})
+		}
 
 		#[test]
 		fn versions_xcm() {