benchmarks fix

paritytech · Jul 3, 2023 · 5ba47db · 5ba47db
1 parent 6f78c24
commit 5ba47db
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 1 deletion.
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -49,6 +49,7 @@ runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parac
 
 slot-range-helper = { path = "slot_range_helper", default-features = false }
 xcm = { path = "../../xcm", default-features = false }
+xcm-builder = { path = "../../xcm/xcm-builder", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4.1"
@@ -97,6 +98,7 @@ std = [
 	"libsecp256k1/std",
 	"runtime-parachains/std",
 	"xcm/std",
+	"xcm-builder/std",
 	"sp-npos-elections/std",
 ]
 runtime-benchmarks = [
@@ -107,7 +109,9 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
-	"pallet-fast-unstake/runtime-benchmarks"
+	"pallet-fast-unstake/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
 ]
 try-runtime = [
 	"runtime-parachains/try-runtime",

diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs
@@ -98,6 +98,33 @@ pub fn era_payout(
 	(staking_payout, rest)
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmarks {
+	use pallet_treasury::ArgumentsFactory;
+	use xcm::prelude::*;
+	use xcm_builder::LocatableAssetId;
+
+	/// Implements the [`ArgumentsFactory`] trait to provide factory methods for benchmarks 
+	/// that require the `AssetKind` of [`LocatableAssetId`] and the `Beneficiary` of [`MultiLocation`]. 
+	/// The location of the asset is determined as a Parachain with an ID equal to the passed seed.
+	pub struct MultiLocationFactory;
+	impl ArgumentsFactory<LocatableAssetId, MultiLocation> for MultiLocationFactory {
+		fn create_asset_kind(seed: u32) -> LocatableAssetId {
+			LocatableAssetId {
+				asset_id: MultiLocation::new(
+					0,
+					X2(PalletInstance(seed.try_into().unwrap()), GeneralIndex(seed.into())),
+				)
+				.into(),
+				location: MultiLocation::new(0, X1(Parachain(seed))),
+			}
+		}
+		fn create_beneficiary(seed: [u8; 32]) -> MultiLocation {
+			MultiLocation::new(0, X1(AccountId32 { network: None, id: seed }))
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -660,8 +660,14 @@ impl pallet_treasury::Config for Runtime {
 		IdentityConvert,
 		CloneIdentity,
 	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type BalanceConverter = AssetRate;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BalanceConverter = ();
+
 	type PayoutPeriod = PayoutSpendPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::benchmarks::MultiLocationFactory;
 }
 
 parameter_types! {

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -695,8 +695,14 @@ impl pallet_treasury::Config for Runtime {
 		IdentityConvert,
 		CloneIdentity,
 	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type BalanceConverter = AssetRate;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BalanceConverter = ();
+
 	type PayoutPeriod = PayoutSpendPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::benchmarks::MultiLocationFactory;
 }
 
 parameter_types! {

diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
@@ -594,8 +594,14 @@ impl pallet_treasury::Config for Runtime {
 		IdentityConvert,
 		CloneIdentity,
 	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type BalanceConverter = AssetRate;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BalanceConverter = ();
+
 	type PayoutPeriod = PayoutSpendPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::benchmarks::MultiLocationFactory;
 }
 
 parameter_types! {