fix: Adjust settings for benchmarking

runtime/kreivo/src/benchmarking/impls.rs

@@ -14,7 +14,16 @@
 };
 use xcm_config::RelayLocation;
 
-impl frame_system_benchmarking::Config for Runtime {}
+impl frame_system_benchmarking::Config for Runtime {
+	fn setup_set_code_requirements(code: &Vec<u8>) -> Result<(), BenchmarkError> {
+		ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32);
+		Ok(())
+	}
+
+	fn verify_set_code() {
+		System::assert_last_event(cumulus_pallet_parachain_system::Event::<Runtime>::ValidationFunctionStored.into());
+	}
+}
 
 impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
@@ -43,24 +52,18 @@
 		let holding_fungibles = holding_non_fungibles.saturating_sub(1);
 		let fungibles_amount: u128 = 100;
 		let mut assets = (0..holding_fungibles)
-			.map(|i| Asset {
-				id: AssetId(GeneralIndex(i as u128).into()),
-				fun: Fungible(fungibles_amount * i as u128),
-			})
-			.chain(core::iter::once(Asset {
-				id: AssetId(Here.into()),
-				fun: Fungible(u128::MAX),
-			}))
-			.chain((0..holding_non_fungibles).map(|i| Asset {
-				id: AssetId(GeneralIndex(i as u128).into()),
-				fun: NonFungible(asset_instance_from(i)),
+			.map(|i| (AssetId(GeneralIndex(i as u128).into()), fungibles_amount * i as u128).into())
+			.chain(core::iter::once((AssetId(Here.into()), u128::MAX).into()))
+			.chain((0..holding_non_fungibles).map(|i| {
+				(
+					AssetId(GeneralIndex(i as u128).into()),
+					NonFungible(asset_instance_from(i)),
+				)
+					.into()
 			}))
 			.collect::<Vec<_>>();
 
-		assets.push(Asset {
-			id: AssetId(RelayLocation::get()),
-			fun: Fungible(1_000_000 * UNITS),
-		});
+		assets.push((RelayLocation::get(), 1_000_000 * UNITS).into());
 		assets.into()
 	}
 }
@@ -68,7 +71,7 @@
 parameter_types! {
 	pub const TrustedTeleporter: Option<(Location, Asset)> = Some((
 		RelayLocation::get(),
 		Asset { fun: Fungible(1 * UNITS), id: AssetId(RelayLocation::get()) },
 	));
 	pub const TrustedReserve: Option<(Location, Asset)> = None;
 	pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
@@ -82,11 +85,7 @@
 	type TrustedReserve = TrustedReserve;
 
 	fn get_asset() -> Asset {
-		Asset {
-			id: AssetId(RelayLocation::get()),
-			fun: Fungible(1 * UNITS),
-		}
-		.into()
+		(RelayLocation::get(), UNITS).into()
 	}
 }
 
@@ -120,18 +119,12 @@
 	fn claimable_asset() -> Result<(Location, Location, XcmAssets), BenchmarkError> {
 		let origin = RelayLocation::get();
 		let assets: XcmAssets = (AssetId(RelayLocation::get()), 1_000 * UNITS).into();
-		let ticket = Location {
-			parents: 0,
-			interior: Here,
-		};
+		let ticket = Here.into();
 		Ok((origin, ticket, assets))
 	}
 
 	fn fee_asset() -> Result<Asset, BenchmarkError> {
-		Ok(Asset {
-			id: AssetId(RelayLocation::get()),
-			fun: Fungible(1_000_000 * UNITS),
-		})
+		Ok((RelayLocation::get(), 1_000_000 * UNITS).into())
 	}
 
 	fn unlockable_asset() -> Result<(Location, Location, Asset), BenchmarkError> {

runtime/kreivo/src/config/communities/memberships.rs

@@ -1,5 +1,6 @@
 use super::*;
 
+use fc_traits_memberships::OnMembershipAssigned;
 use frame_system::EnsureRootWithSuccess;
 use sp_runtime::traits::Verify;
 
@@ -14,6 +15,22 @@
 	pub const DepositPerByte: Balance = 0;
 }
 
+const WELL_KNOWN_ATTR_KEYS: [&[u8]; 3] = [b"membership_member_rank", b"membership_gas", b"membership_expiration"];
+
+parameter_types! {
+	pub CopySystemAttributesOnAssign: Box<dyn OnMembershipAssigned<AccountId, CommunityId, MembershipId>> =
+		Box::new(|_, group, m| {
+			use frame_support::traits::nonfungibles_v2::{Inspect as NonFunsInspect, Mutate};
+			for key in WELL_KNOWN_ATTR_KEYS.into_iter() {
+				if let Some(value) = CommunityMemberships::system_attribute(&group, Some(&m), key) {
+					<CommunityMemberships as Mutate<_, _>>::set_attribute(&group, &m, key, &value)?;
+				}
+			}
+
+			Ok(())
+		});
+}
+
 pub type CommunityMembershipsInstance = pallet_nfts::Instance2;
 
 // From https://github.com/polkadot-fellows/runtimes/blob/main/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs#L810
@@ -63,8 +80,8 @@
 impl pallet_nfts::BenchmarkHelper<CommunityId, MembershipId, <Signature as Verify>::Signer, AccountId, Signature>
 	for NftsBenchmarksHelper
 {
-	fn collection(_: u16) -> CommunityId {
-		<Runtime as pallet_communities::Config>::BenchmarkHelper::community_id()
+	fn collection(id: u16) -> CommunityId {
+		id.into()
 	}
 	fn item(i: u16) -> MembershipId {
 		i.into()

runtime/kreivo/src/config/communities/mod.rs

@@ -10,7 +10,6 @@ use virto_common::{CommunityId, MembershipId};
 
 use fc_traits_memberships::{NonFungiblesMemberships, WithHooks};
 pub mod governance;
-mod kreivo_memberships;
 pub mod memberships;
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -65,7 +64,7 @@ impl pallet_communities::Config for Runtime {
 	type AdminOrigin = EitherOf<EnsureCommunity<Self>, EnsureCommunityAccount>;
 	type MemberMgmtOrigin = EitherOf<EnsureCommunity<Self>, EnsureCommunityAccount>;
 	type MemberMgmt =
-		WithHooks<NonFungiblesMemberships<CommunityMemberships>, kreivo_memberships::CopySystemAttributesOnAssign>;
+		WithHooks<NonFungiblesMemberships<CommunityMemberships>, memberships::CopySystemAttributesOnAssign>;
 	type MembershipId = MembershipId;
 
 	type Polls = CommunityReferenda;

runtime/kreivo/src/config/contracts/mod.rs

@@ -1,22 +1,29 @@
 use super::*;
 use frame_support::{
 	parameter_types,
-	traits::{ConstBool, ConstU32, EitherOf, Randomness},
+	traits::{ConstBool, ConstU32, Randomness},
 };
-use frame_system::{pallet_prelude::BlockNumberFor, EnsureRootWithSuccess};
+use frame_system::pallet_prelude::BlockNumberFor;
 use kreivo_apis::KreivoChainExtensions;
 use pallet_balances::Call as BalancesCall;
-use pallet_communities::origin::AsSignedByStaticCommunity;
-use sp_core::ConstU16;
+
+#[cfg(not(feature = "runtime-benchmarks"))]
+use {
+	frame_support::traits::EitherOf, frame_system::EnsureRootWithSuccess,
+	pallet_communities::origin::AsSignedByStaticCommunity, sp_core::ConstU16,
+};
+
+#[cfg(feature = "runtime-benchmarks")]
+use frame_system::EnsureSigned;
 
 pub enum CallFilter {}
 
 impl frame_support::traits::Contains<RuntimeCall> for CallFilter {
 	fn contains(call: &RuntimeCall) -> bool {
-		match call {
-			RuntimeCall::Balances(BalancesCall::transfer_allow_death { .. }) | RuntimeCall::Assets(_) => true,
-			_ => false,
-		}
+		matches!(
+			call,
+			RuntimeCall::Balances(BalancesCall::transfer_allow_death { .. }) | RuntimeCall::Assets(_)
+		)
 	}
 }
 
@@ -95,15 +102,27 @@ impl pallet_contracts::Config for Runtime {
 	type MaxDelegateDependencies = ConstU32<32>;
 	type UnsafeUnstableInterface = ConstBool<true>;
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type UploadOrigin = EnsureRootWithSuccess<AccountId, TreasuryAccount>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type UploadOrigin = EnsureSigned<AccountId>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type InstantiateOrigin = EitherOf<
 		EnsureRootWithSuccess<AccountId, TreasuryAccount>,
 		EitherOf<
 			AsSignedByStaticCommunity<Runtime, ConstU16<1>>, // Virto
 			AsSignedByStaticCommunity<Runtime, ConstU16<2>>, // Kippu
 		>,
 	>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type InstantiateOrigin = EnsureSigned<AccountId>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type Migrations = ();
+	#[cfg(feature = "runtime-benchmarks")]
+	type Migrations = (
+		pallet_contracts::migration::v15::Migration<Self>,
+		pallet_contracts::migration::v16::Migration<Self>,
+	);
 
 	type Debug = ();
 	type Environment = ();

runtime/kreivo/src/config/system.rs

@@ -105,7 +105,6 @@ parameter_types! {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
-	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
@@ -115,6 +114,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
+	type WeightInfo = ();
 	type ConsensusHook = ConsensusHook;
 }