Merge pull request #324 from peaqnetwork/bug/1207284892090625_benchma…

…rk_build_fails Bug/1207284892090625 benchmark build fails
peaqnetwork · Jan 7, 2025 · c772322 · c772322
2 parents 0e9be32 + 7b99339
commit c772322
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/src/command.rs b/node/src/command.rs
@@ -320,7 +320,9 @@ pub fn run() -> sc_cli::Result<()> {
 				match cmd {
 					BenchmarkCmd::Pallet(cmd) => {
 						with_runtime_or_err!(chain_spec, {
-							runner.sync_run(|config| cmd.run::<Block>(config))
+							runner.sync_run(|config| {
+								cmd.run::<Block, parachain::ExtHostFunctions>(config)
+							})
 						})
 					},
 					BenchmarkCmd::Block(cmd) => {

diff --git a/node/src/parachain/mod.rs b/node/src/parachain/mod.rs
@@ -15,6 +15,8 @@ pub mod krest_chain_spec;
 pub mod peaq_chain_spec;
 
 pub use service::build_import_queue;
+#[cfg(feature = "runtime-benchmarks")]
+pub use service::ExtHostFunctions;
 
 /// Node `ChainSpec` extensions.
 ///

diff --git a/node/src/parachain/service.rs b/node/src/parachain/service.rs
@@ -59,15 +59,17 @@ declare_executor!(dev, peaq_dev_runtime);
 declare_executor!(krest, peaq_krest_runtime);
 declare_executor!(peaq, peaq_runtime);
 
-type FullClient<RuntimeApi> = TFullClient<
-	Block,
-	RuntimeApi,
-	WasmExecutor<(
-		sp_io::SubstrateHostFunctions,
-		frame_benchmarking::benchmarking::HostFunctions,
-		peaq_primitives_ext::peaq_ext::HostFunctions,
-	)>,
->;
+#[cfg(feature = "runtime-benchmarks")]
+pub type ExtHostFunctions = (
+	frame_benchmarking::benchmarking::HostFunctions,
+	sp_io::SubstrateHostFunctions,
+	peaq_primitives_ext::peaq_ext::HostFunctions,
+);
+#[cfg(not(feature = "runtime-benchmarks"))]
+pub type ExtHostFunctions =
+	(sp_io::SubstrateHostFunctions, peaq_primitives_ext::peaq_ext::HostFunctions);
+
+type FullClient<RuntimeApi> = TFullClient<Block, RuntimeApi, WasmExecutor<ExtHostFunctions>>;
 type FullBackend = TFullBackend<Block>;
 
 pub fn frontier_database_dir(config: &Configuration, path: &str) -> std::path::PathBuf {

diff --git a/runtime/krest/src/lib.rs b/runtime/krest/src/lib.rs
@@ -1142,7 +1142,7 @@ mod benches {
 		[peaq_pallet_did, PeaqDid]
 		[peaq_pallet_rbac, PeaqRbac]
 		[peaq_pallet_storage, PeaqStorage]
-		[pallet_xcm, PolkadotXcm]
+		// [pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		[pallet_assets, Assets]
 		[xc_asset_config, XcAssetConfig]
 		[address_unification, AddressUnification]
@@ -2000,7 +2000,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey};
+			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch};
+			use frame_support::traits::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use baseline::Pallet as BaselineBench;
 

diff --git a/runtime/krest/src/xcm_config.rs b/runtime/krest/src/xcm_config.rs
@@ -344,8 +344,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDestBench;
 
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;

diff --git a/runtime/peaq-dev/src/lib.rs b/runtime/peaq-dev/src/lib.rs
@@ -1158,7 +1158,7 @@ mod benches {
 		[peaq_pallet_rbac, PeaqRbac]
 		[peaq_pallet_storage, PeaqStorage]
 		[peaq_pallet_mor, PeaqMor]
-		[pallet_xcm, PolkadotXcm]
+		// [pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		[pallet_assets, Assets]
 		[xc_asset_config, XcAssetConfig]
 		[address_unification, AddressUnification]
@@ -2016,7 +2016,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey};
+			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch};
+			use frame_support::traits::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use baseline::Pallet as BaselineBench;
 
@@ -2038,7 +2039,7 @@ impl_runtime_apis! {
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
 		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
-
+			log::info!("try-runtime::on_runtime_upgrade polkadot.");
 			let weight = Executive::try_runtime_upgrade(checks).unwrap();
 			(weight, RuntimeBlockWeights::get().max_block)
 		}

diff --git a/runtime/peaq-dev/src/xcm_config.rs b/runtime/peaq-dev/src/xcm_config.rs
@@ -344,8 +344,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDestBench;
 
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;

diff --git a/runtime/peaq/src/lib.rs b/runtime/peaq/src/lib.rs
@@ -1174,7 +1174,7 @@ mod benches {
 		[peaq_pallet_did, PeaqDid]
 		[peaq_pallet_rbac, PeaqRbac]
 		[peaq_pallet_storage, PeaqStorage]
-		[pallet_xcm, PolkadotXcm]
+		// [pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		[pallet_assets, Assets]
 		[xc_asset_config, XcAssetConfig]
 		[address_unification, AddressUnification]
@@ -2032,7 +2032,8 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey};
+			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch};
+			use frame_support::traits::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use baseline::Pallet as BaselineBench;
 

diff --git a/runtime/peaq/src/xcm_config.rs b/runtime/peaq/src/xcm_config.rs
@@ -344,8 +344,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDestBench;
 
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;