From 4387b1a2d0e7e13c96705d2d3c1d8365ed63626f Mon Sep 17 00:00:00 2001 From: ut-akuznetsov <59873862+ut-akuznetsov@users.noreply.github.com> Date: Thu, 15 Dec 2022 17:46:32 +0000 Subject: [PATCH] Merge pull request #771 from UniqueNetwork/fix/runtime-benchmark-list --- --- a/runtime/common/runtime_apis.rs +++ b/runtime/common/runtime_apis.rs @@ -684,23 +684,26 @@ list_benchmark!(list, extra, pallet_unique, Unique); list_benchmark!(list, extra, pallet_structure, Structure); list_benchmark!(list, extra, pallet_inflation, Inflation); + + #[cfg(feature = "app-promotion")] list_benchmark!(list, extra, pallet_app_promotion, AppPromotion); + list_benchmark!(list, extra, pallet_fungible, Fungible); list_benchmark!(list, extra, pallet_nonfungible, Nonfungible); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "refungible")] list_benchmark!(list, extra, pallet_refungible, Refungible); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "scheduler")] list_benchmark!(list, extra, pallet_unique_scheduler_v2, Scheduler); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "rmrk")] list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "rmrk")] list_benchmark!(list, extra, pallet_proxy_rmrk_equip, RmrkEquip); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "foreign-assets")] list_benchmark!(list, extra, pallet_foreign_assets, ForeignAssets); @@ -744,23 +747,26 @@ add_benchmark!(params, batches, pallet_unique, Unique); add_benchmark!(params, batches, pallet_structure, Structure); add_benchmark!(params, batches, pallet_inflation, Inflation); + + #[cfg(feature = "app-promotion")] add_benchmark!(params, batches, pallet_app_promotion, AppPromotion); + add_benchmark!(params, batches, pallet_fungible, Fungible); add_benchmark!(params, batches, pallet_nonfungible, Nonfungible); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "refungible")] add_benchmark!(params, batches, pallet_refungible, Refungible); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "scheduler")] add_benchmark!(params, batches, pallet_unique_scheduler_v2, Scheduler); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "rmrk")] add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "rmrk")] add_benchmark!(params, batches, pallet_proxy_rmrk_equip, RmrkEquip); - #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] + #[cfg(feature = "foreign-assets")] add_benchmark!(params, batches, pallet_foreign_assets, ForeignAssets); // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate); --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -40,6 +40,7 @@ 'pallet-unique/runtime-benchmarks', 'pallet-foreign-assets/runtime-benchmarks', 'pallet-inflation/runtime-benchmarks', + 'pallet-app-promotion/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', 'xcm-builder/runtime-benchmarks', @@ -81,6 +82,7 @@ 'pallet-app-promotion/try-runtime', 'pallet-foreign-assets/try-runtime', 'pallet-ethereum/try-runtime', + 'pallet-evm/try-runtime', 'pallet-evm-coder-substrate/try-runtime', 'pallet-evm-contract-helpers/try-runtime', 'pallet-evm-transaction-payment/try-runtime', @@ -128,6 +130,7 @@ 'serde', 'pallet-inflation/std', 'pallet-configuration/std', + 'pallet-app-promotion/std', 'pallet-common/std', 'pallet-structure/std', 'pallet-fungible/std', --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -40,6 +40,7 @@ 'pallet-unique/runtime-benchmarks', 'pallet-foreign-assets/runtime-benchmarks', 'pallet-inflation/runtime-benchmarks', + 'pallet-app-promotion/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', 'xcm-builder/runtime-benchmarks', @@ -82,6 +83,7 @@ 'pallet-app-promotion/try-runtime', 'pallet-foreign-assets/try-runtime', 'pallet-ethereum/try-runtime', + 'pallet-evm/try-runtime', 'pallet-evm-coder-substrate/try-runtime', 'pallet-evm-contract-helpers/try-runtime', 'pallet-evm-transaction-payment/try-runtime', @@ -129,6 +131,7 @@ 'serde', 'pallet-inflation/std', 'pallet-configuration/std', + 'pallet-app-promotion/std', 'pallet-common/std', 'pallet-structure/std', 'pallet-fungible/std', -- gitstuff