weight_to_fee implemeted in pallet-xc-asset-config

pallets/xc-asset-config/src/lib.rs

@@ -49,6 +49,7 @@
 //! `ExecutionPaymentRate` interface for fetching `units per second` if asset is supported payment asset
 //! - `get_units_per_second`
 //!
+//! - `weight_to_fee` method is used to convert weight to fee based on units per second and weight.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -72,7 +73,9 @@ pub use weights::WeightInfo;
 pub mod pallet {
 
     use crate::weights::WeightInfo;
-    use frame_support::{pallet_prelude::*, traits::EnsureOrigin};
+    use frame_support::{
+        pallet_prelude::*, traits::EnsureOrigin, weights::constants::WEIGHT_REF_TIME_PER_SECOND,
+    };
     use frame_system::pallet_prelude::*;
     use parity_scale_codec::HasCompact;
     use sp_std::boxed::Box;
@@ -116,6 +119,14 @@ pub mod pallet {
         }
     }
 
+    impl<T: Config> Pallet<T> {
+        /// Convert weight to fee based on units per second and weight.
+        pub fn weight_to_fee(weight: Weight, units_per_second: u128) -> u128 {
+            units_per_second.saturating_mul(weight.ref_time() as u128)
+                / (WEIGHT_REF_TIME_PER_SECOND as u128)
+        }
+    }
+
     #[pallet::config]
     pub trait Config: frame_system::Config {
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

primitives/src/xcm/mod.rs

@@ -26,7 +26,6 @@
 //! - `FixedRateOfForeignAsset` - weight trader for execution payment in foreign asset
 //! - `ReserveAssetFilter` - used to check whether asset/origin are a valid reserve location
 //! - `XcmFungibleFeeHandler` - used to handle XCM fee execution fees
-//! - `WeightToForeignAssetFee` - used to convert weight to fee based on units per second and weight.
 //!
 //! Please refer to implementation below for more info.
 //!
@@ -356,12 +355,3 @@ impl<T: Contains<Location>> ShouldExecute for AllowTopLevelPaidExecutionFrom<T>
         Ok(())
     }
 }
-
-pub struct WeightToForeignAssetFee;
-impl WeightToForeignAssetFee {
-    /// Convert weight to fee based on units per second and weight.
-    pub fn weight_to_fee(weight: Weight, units_per_second: u128) -> u128 {
-        units_per_second.saturating_mul(weight.ref_time() as u128)
-            / (WEIGHT_REF_TIME_PER_SECOND as u128)
-    }
-}

runtime/astar/src/lib.rs

@@ -83,7 +83,7 @@ use astar_primitives::{
     },
     evm::EvmRevertCodeHandler,
     oracle::{CurrencyAmount, CurrencyId, DummyCombineData, Price},
-    xcm::{AssetLocationIdConverter, WeightToForeignAssetFee},
+    xcm::AssetLocationIdConverter,
     Address, AssetId, BlockNumber, Hash, Header, Nonce, UnfreezeChainOnFailedMigration,
 };
 pub use astar_primitives::{governance::OracleMembershipInst, AccountId, Balance, Signature};
@@ -1946,7 +1946,7 @@ impl_runtime_apis! {
 
                 match pallet_xc_asset_config::AssetLocationUnitsPerSecond::<Runtime>::get(versioned_location) {
                     Some(units_per_sec) => {
-                        Ok(WeightToForeignAssetFee::weight_to_fee(weight, units_per_sec))
+                        Ok(pallet_xc_asset_config::Pallet::<Runtime>::weight_to_fee(weight, units_per_sec))
                     }
                     None => Err(XcmPaymentApiError::AssetNotFound),
                 }

runtime/shibuya/src/lib.rs

@@ -93,7 +93,7 @@ use astar_primitives::{
         TechnicalCommitteeMembershipInst,
     },
     oracle::{CurrencyAmount, CurrencyId, DummyCombineData, Price},
-    xcm::{AssetLocationIdConverter, WeightToForeignAssetFee},
+    xcm::AssetLocationIdConverter,
     Address, AssetId, BlockNumber, Hash, Header, Nonce, UnfreezeChainOnFailedMigration,
 };
 pub use astar_primitives::{AccountId, Balance, Signature};
@@ -2277,7 +2277,7 @@ impl_runtime_apis! {
 
                 match pallet_xc_asset_config::AssetLocationUnitsPerSecond::<Runtime>::get(versioned_location) {
                     Some(units_per_sec) => {
-                        Ok(WeightToForeignAssetFee::weight_to_fee(weight, units_per_sec))
+                        Ok(pallet_xc_asset_config::Pallet::<Runtime>::weight_to_fee(weight, units_per_sec))
                     }
                     None => Err(XcmPaymentApiError::AssetNotFound),
                 }

runtime/shiden/src/lib.rs

@@ -83,7 +83,7 @@ use astar_primitives::{
     evm::EvmRevertCodeHandler,
     governance::OracleMembershipInst,
     oracle::{CurrencyAmount, CurrencyId, DummyCombineData, Price},
-    xcm::{AssetLocationIdConverter, WeightToForeignAssetFee},
+    xcm::AssetLocationIdConverter,
     Address, AssetId, BlockNumber, Hash, Header, Nonce, UnfreezeChainOnFailedMigration,
 };
 pub use astar_primitives::{AccountId, Balance, Signature};
@@ -1947,7 +1947,7 @@ impl_runtime_apis! {
 
                 match pallet_xc_asset_config::AssetLocationUnitsPerSecond::<Runtime>::get(versioned_location) {
                     Some(units_per_sec) => {
-                        Ok(WeightToForeignAssetFee::weight_to_fee(weight, units_per_sec))
+                        Ok(pallet_xc_asset_config::Pallet::<Runtime>::weight_to_fee(weight, units_per_sec))
                     }
                     None => Err(XcmPaymentApiError::AssetNotFound),
                 }

tests/integration/src/xcm_api.rs

@@ -18,7 +18,6 @@
 
 use crate::setup::*;
 
-pub use astar_primitives::xcm::WeightToForeignAssetFee;
 use sp_runtime::traits::Zero;
 use xcm::{
     v4::{
@@ -140,7 +139,7 @@ fn query_weight_to_asset_fee_is_ok() {
             );
 
             let weight = Weight::from_parts(1_000_000_000, 1_000_000);
-            let expected_fee = WeightToForeignAssetFee::weight_to_fee(weight, units_per_second);
+            let expected_fee = XcAssetConfig::weight_to_fee(weight, units_per_second);
             let fee =
                 Runtime::query_weight_to_asset_fee(weight, XcmAssetId(payable_location).into())
                     .expect("Must return fee for payable asset.");