[MOON-3323] Refactor XCM Transactor to Delegate Fee Pricing to XCM Weight Trader

Cargo.toml

@@ -36,6 +36,7 @@ members = [
     "precompiles/xtokens",
     "precompiles/p256verify",
     "primitives/storage-proof",
+    "primitives/tests-primitives",
     "primitives/bridge/moonbeam",
     "primitives/bridge/moonriver",
     "runtime/moonbase",
@@ -108,6 +109,7 @@ pallet-proxy-genesis-companion = { path = "pallets/proxy-genesis-companion", def
 pallet-xcm-transactor = { path = "pallets/xcm-transactor", default-features = false }
 pallet-xcm-weight-trader = { path = "pallets/xcm-weight-trader", default-features = false }
 xcm-primitives = { path = "primitives/xcm", default-features = false }
+moonbeam-tests-primitives = { path = "primitives/tests-primitives", default-features = false }
 
 # Local bridge crates
 bp-moonbeam = { path = "primitives/bridge/moonbeam", default-features = false }

pallets/xcm-transactor/Cargo.toml

@@ -36,6 +36,7 @@ pallet-timestamp = { workspace = true, features = [ "std" ] }
 parity-scale-codec = { workspace = true, features = [ "std" ] }
 sp-core = { workspace = true, features = [ "std" ] }
 sp-runtime = { workspace = true }
+moonbeam-tests-primitives = { workspace = true }
 
 [features]
 default = [ "std" ]

pallets/xcm-transactor/src/benchmarks.rs

@@ -23,6 +23,7 @@ use frame_system::RawOrigin;
 use sp_std::boxed::Box;
 use sp_std::vec;
 use xcm::latest::prelude::*;
+use xcm_primitives::XcmFeeTrader;
 
 /// Helper function to set up XCM router for benchmarks
 fn setup_xcm_router<T: Config>() {
@@ -118,26 +119,6 @@ mod benchmarks {
 		Ok(())
 	}
 
-	#[benchmark]
-	fn set_fee_per_second() -> Result<(), BenchmarkError> {
-		let fee_per_second = 1;
-		let location = Location::parent();
-
-		#[extrinsic_call]
-		_(
-			RawOrigin::Root,
-			Box::new(xcm::VersionedLocation::from(location.clone())),
-			fee_per_second,
-		);
-
-		assert_eq!(
-			Pallet::<T>::dest_asset_fee_per_second(&location),
-			Some(fee_per_second)
-		);
-
-		Ok(())
-	}
-
 	// Worst Case: AsCurrencyId, as the translation could involve db reads
 	// Worst Case: transacInfo db reads
 	#[benchmark]
@@ -161,12 +142,8 @@ mod benchmarks {
 			Some(extra_weight),
 		)
 		.expect("must succeed");
-		Pallet::<T>::set_fee_per_second(
-			RawOrigin::Root.into(),
-			Box::new(xcm::VersionedLocation::from(location.clone())),
-			fee_per_second,
-		)
-		.expect("must succeed");
+		<T as Config>::FeeTrader::set_asset_price(location.clone(), fee_per_second)
+			.expect("must succeed");
 		Pallet::<T>::register(RawOrigin::Root.into(), user.clone(), 0).expect("must succeed");
 
 		#[block]
@@ -222,12 +199,8 @@ mod benchmarks {
 			Some(extra_weight),
 		)
 		.expect("must succeed");
-		Pallet::<T>::set_fee_per_second(
-			RawOrigin::Root.into(),
-			Box::new(xcm::VersionedLocation::from(location.clone())),
-			fee_per_second,
-		)
-		.expect("must succeed");
+		<T as Config>::FeeTrader::set_asset_price(location.clone(), fee_per_second)
+			.expect("must succeed");
 
 		#[block]
 		{
@@ -283,12 +256,8 @@ mod benchmarks {
 			Some(extra_weight),
 		)
 		.expect("must succeed");
-		Pallet::<T>::set_fee_per_second(
-			RawOrigin::Root.into(),
-			Box::new(xcm::VersionedLocation::from(location.clone())),
-			fee_per_second,
-		)
-		.expect("must succeed");
+		<T as Config>::FeeTrader::set_asset_price(location.clone(), fee_per_second)
+			.expect("must succeed");
 
 		#[extrinsic_call]
 		_(
@@ -331,12 +300,8 @@ mod benchmarks {
 			Some(extra_weight),
 		)
 		.expect("must succeed");
-		Pallet::<T>::set_fee_per_second(
-			RawOrigin::Root.into(),
-			Box::new(xcm::VersionedLocation::from(location.clone())),
-			fee_per_second,
-		)
-		.expect("must succeed");
+		<T as Config>::FeeTrader::set_asset_price(location.clone(), fee_per_second)
+			.expect("must succeed");
 
 		#[extrinsic_call]
 		_(