Fix xcm benchmark tests

pallets/asset-manager/src/benchmarking.rs

@@ -28,6 +28,7 @@ use manta_primitives::{
     types::Balance,
 };
 use scale_info::prelude::*;
+use sp_runtime::traits::One;
 use sp_std::vec;
 use xcm::latest::prelude::*;
 
@@ -39,6 +40,9 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 }
 
 pub fn register_asset_helper<T: Config>(location: MultiLocation, i: u32) {
+    if crate::LocationAssetId::<T>::contains_key(T::Location::from(location)) {
+        return;
+    }
     let metadata = AssetRegistryMetadata::<Balance> {
         metadata: AssetStorageMetadata {
             name: format!("{}-name", i).into(),
@@ -51,12 +55,9 @@ pub fn register_asset_helper<T: Config>(location: MultiLocation, i: u32) {
     };
     Pallet::<T>::register_asset(RawOrigin::Root.into(), location.into(), metadata)
         .expect("Filed to register asset");
-    Pallet::<T>::set_units_per_second(
-        RawOrigin::Root.into(),
-        <T as Config>::AssetId::from(i),
-        i.into(),
-    )
-    .expect("Filed to set ups");
+    let current_asset_id = crate::NextAssetId::<T>::get() - One::one();
+    Pallet::<T>::set_units_per_second(RawOrigin::Root.into(), current_asset_id, i.into())
+        .expect("Filed to set ups");
 }
 
 benchmarks! {

runtime/calamari/src/lib.rs

@@ -1162,9 +1162,8 @@ mod benches {
         // always get this error(Unimplemented) while benchmarking pallet_xcm_benchmarks::fungible::initiate_teleport
         // so this time we will use statemint's fungible weights
         // and actually we don't support teleport now
-        // [pallet_xcm_benchmarks::generic, XcmGeneric]
-        // [pallet_xcm_benchmarks::fungible, pallet_xcm_benchmarks::fungible::Pallet::<Runtime>]
-        // [pallet_xcm_benchmarks::generic, pallet_xcm_benchmarks::generic::Pallet::<Runtime>]
+        [pallet_xcm_benchmarks::fungible, pallet_xcm_benchmarks::fungible::Pallet::<Runtime>]
+        [pallet_xcm_benchmarks::generic, pallet_xcm_benchmarks::generic::Pallet::<Runtime>]
         // Nimbus pallets
         // [pallet_author_inherent, AuthorInherent]
     );
@@ -1519,9 +1518,6 @@ impl_runtime_apis! {
             use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
             use frame_system_benchmarking::Pallet as SystemBench;
 
-            //type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-            //type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
             let mut list = Vec::<BenchmarkList>::new();
             list_benchmarks!(list, extra);
 
@@ -1551,7 +1547,6 @@ impl_runtime_apis! {
             use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
             impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
-            use pallet_xcm_benchmarks::asset_instance_from;
             use xcm_config::{LocationToAccountId, XcmExecutorConfig};
 
             parameter_types! {
@@ -1580,7 +1575,21 @@ impl_runtime_apis! {
                 >;
 
                 fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-                 Ok(KsmLocation::get())
+                    let mut assets = vec![];
+
+                    for (i, asset) in assets.iter().enumerate() {
+                        if let MultiAsset {
+                            id: Concrete(location),
+                            fun: Fungible(_)
+                        } = asset {
+                            pallet_asset_manager::benchmarking::register_asset_helper::<Runtime>(*location, i as u32);
+                        }
+                    }
+                    assets.push(MultiAsset {
+                        id: Concrete(KsmLocation::get()),
+                        fun: Fungible(1_000_000 * KMA),
+                    });
+                    Ok(KsmLocation::get())
                 }
 
                 fn worst_case_holding(depositable_count: u32) -> MultiAssets {
@@ -1596,16 +1605,25 @@ impl_runtime_apis! {
                             }
                         })
                         .chain(core::iter::once(MultiAsset { id: Concrete(Here.into()), fun: Fungible(u128::MAX) }))
-                        .chain((0..holding_non_fungibles).map(|i| MultiAsset {
-                            id: Concrete(GeneralIndex(i as u128).into()),
-                            fun: NonFungible(asset_instance_from(i)),
-                        }))
                         .collect::<Vec<_>>();
 
-                    assets.push(MultiAsset {
-                        id: Concrete(KmaLocation::get()),
-                        fun: Fungible(1_000_000 * KMA),
-                    });
+                        assets.push(MultiAsset {
+                            id: Concrete(KsmLocation::get()),
+                            fun: Fungible(1_000_000 * KMA),
+                        });
+                        assets.push(MultiAsset {
+                            id: Concrete(KmaLocation::get()),
+                            fun: Fungible(1_000_000 * KMA),
+                        });
+
+                        for (i, asset) in assets.iter().enumerate() {
+                            if let MultiAsset {
+                                id: Concrete(location),
+                                fun: Fungible(_)
+                            } = asset {
+                                pallet_asset_manager::benchmarking::register_asset_helper::<Runtime>(*location, i as u32);
+                            }
+                        }
                     assets.into()
                 }
             }
@@ -1670,9 +1688,6 @@ impl_runtime_apis! {
                 }
             }
 
-            //type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-            //type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
             let whitelist: Vec<TrackedStorageKey> = vec![
                 // Block Number
                 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),

runtime/manta/src/lib.rs

@@ -1087,8 +1087,8 @@ mod benches {
         [cumulus_pallet_xcmp_queue, XcmpQueue]
         // always get this error(Unimplemented) while benchmarking pallet_xcm_benchmarks::fungible::initiate_teleport
         // so this time we will use statemint's fungible weights
-        // [pallet_xcm_benchmarks::fungible, XcmBalances]
-        // [pallet_xcm_benchmarks::generic, XcmGeneric]
+        [pallet_xcm_benchmarks::fungible, XcmBalances]
+        [pallet_xcm_benchmarks::generic, XcmGeneric]
         [pallet_session, SessionBench::<Runtime>]
         // Manta pallets
         [pallet_tx_pause, TransactionPause]
@@ -1448,8 +1448,8 @@ impl_runtime_apis! {
             use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
             use frame_system_benchmarking::Pallet as SystemBench;
 
-            //type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-            //type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
+            type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
+            type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
 
             let mut list = Vec::<BenchmarkList>::new();
             list_benchmarks!(list, extra);
@@ -1479,7 +1479,6 @@ impl_runtime_apis! {
             use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
             impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
-            use pallet_xcm_benchmarks::asset_instance_from;
             use xcm_config::{LocationToAccountId, XcmExecutorConfig};
 
             parameter_types! {
@@ -1512,6 +1511,20 @@ impl_runtime_apis! {
                 >;
 
                 fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
+                    let mut assets = vec![];
+
+                    for (i, asset) in assets.iter().enumerate() {
+                        if let MultiAsset {
+                            id: Concrete(location),
+                            fun: Fungible(_)
+                        } = asset {
+                            pallet_asset_manager::benchmarking::register_asset_helper::<Runtime>(*location, i as u32);
+                        }
+                    }
+                    assets.push(MultiAsset {
+                        id: Concrete(DotLocation::get()),
+                        fun: Fungible(1_000_000 * MANTA),
+                    });
                     Ok(DotLocation::get())
                 }
 
@@ -1528,16 +1541,26 @@ impl_runtime_apis! {
                             }
                         })
                         .chain(core::iter::once(MultiAsset { id: Concrete(Here.into()), fun: Fungible(u128::MAX) }))
-                        .chain((0..holding_non_fungibles).map(|i| MultiAsset {
-                            id: Concrete(GeneralIndex(i as u128).into()),
-                            fun: NonFungible(asset_instance_from(i)),
-                        }))
                         .collect::<Vec<_>>();
 
                     assets.push(MultiAsset {
                         id: Concrete(DotLocation::get()),
                         fun: Fungible(1_000_000 * MANTA),
                     });
+                    assets.push(MultiAsset {
+                        id: Concrete(MantaLocation::get()),
+                        fun: Fungible(1_000_000 * MANTA),
+                    });
+
+                    for (i, asset) in assets.iter().enumerate() {
+                        if let MultiAsset {
+                            id: Concrete(location),
+                            fun: Fungible(_)
+                        } = asset {
+                            pallet_asset_manager::benchmarking::register_asset_helper::<Runtime>(*location, i as u32);
+                        }
+                    }
+
                     assets.into()
                 }
             }
@@ -1601,8 +1624,8 @@ impl_runtime_apis! {
                 }
             }
 
-            //type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-            //type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
+            type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
+            type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
 
             let whitelist: Vec<TrackedStorageKey> = vec![
                 // Block Number

scripts/benchmarking/run_all_benchmarks.sh

@@ -79,7 +79,6 @@ MANTA=./target/production/manta
 # Will fix it in next release
 # currently, both pallets have problems on benchmarking
 EXCLUDED_PALLETS=(
-  "frame_system"
   "zenlink_protocol"
 )