Remove AssignmentProviderConfig and use parameters from HostConfiguration instead

polkadot/primitives/src/vstaging/mod.rs

@@ -23,6 +23,7 @@ use sp_std::prelude::*;
 use parity_scale_codec::{Decode, Encode};
 use primitives::RuntimeDebug;
 use scale_info::TypeInfo;
+use sp_arithmetic::Perbill;
 
 /// Approval voting configuration parameters
 #[derive(
@@ -50,6 +51,52 @@ impl Default for ApprovalVotingParams {
 	}
 }
 
+/// Coretime configuration parameters
+#[derive(
+	RuntimeDebug,
+	Copy,
+	Clone,
+	PartialEq,
+	Encode,
+	Decode,
+	TypeInfo,
+	serde::Serialize,
+	serde::Deserialize,
+)]
+pub struct CoretimeParams<BlockNumber> {
+	/// How many cores are managed by the coretime chain.
+	pub cores: u32,
+	/// The max number of times a claim can time out in availability
+	pub max_availability_timeouts: u32,
+	/// The number of blocks a claim stays in the scheduler's claimqueue before getting cleared.
+	/// This number should go reasonably higher than the number of blocks in the async backing
+	/// lookahead.
+	pub ttl: BlockNumber,
+	/// The maximum queue size of the pay as you go module.
+	pub on_demand_queue_max_size: u32,
+	/// The target utilization of the spot price queue in percentages.
+	pub on_demand_target_queue_utilization: Perbill,
+	/// How quickly the fee rises in reaction to increased utilization.
+	/// The lower the number the slower the increase.
+	pub on_demand_fee_variability: Perbill,
+	/// The minimum amount needed to claim a slot in the spot pricing queue.
+	pub on_demand_base_fee: Balance,
+}
+
+impl<BlockNumber: Default + From<u32>> Default for CoretimeParams<BlockNumber> {
+	fn default() -> Self {
+		Self {
+			cores: Default::default(),
+			max_availability_timeouts: Default::default(),
+			ttl: 5u32.into(),
+			on_demand_queue_max_size: ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+			on_demand_target_queue_utilization: Perbill::from_percent(25),
+			on_demand_fee_variability: Perbill::from_percent(3),
+			on_demand_base_fee: 10_000_000u128,
+		}
+	}
+}
+
 use bitvec::vec::BitVec;
 
 /// Bit indices in the `HostConfiguration.node_features` that correspond to different node features.

polkadot/runtime/parachains/src/assigner_coretime/mock_helpers.rs

@@ -64,11 +64,12 @@ impl GenesisConfigBuilder {
 	pub(super) fn build(self) -> MockGenesisConfig {
 		let mut genesis = default_genesis_config();
 		let config = &mut genesis.configuration.config;
-		config.coretime_cores = self.on_demand_cores;
-		config.on_demand_base_fee = self.on_demand_base_fee;
-		config.on_demand_fee_variability = self.on_demand_fee_variability;
-		config.on_demand_queue_max_size = self.on_demand_max_queue_size;
-		config.on_demand_target_queue_utilization = self.on_demand_target_queue_utilization;
+		config.coretime_params.cores = self.on_demand_cores;
+		config.coretime_params.on_demand_base_fee = self.on_demand_base_fee;
+		config.coretime_params.on_demand_fee_variability = self.on_demand_fee_variability;
+		config.coretime_params.on_demand_queue_max_size = self.on_demand_max_queue_size;
+		config.coretime_params.on_demand_target_queue_utilization =
+			self.on_demand_target_queue_utilization;
 
 		let paras = &mut genesis.paras.paras;
 		for para_id in self.onboarded_on_demand_chains {

polkadot/runtime/parachains/src/assigner_coretime/mod.rs

@@ -30,7 +30,7 @@ mod tests;
 use crate::{
 	assigner_on_demand, configuration,
 	paras::AssignCoretime,
-	scheduler::common::{Assignment, AssignmentProvider, AssignmentProviderConfig},
+	scheduler::common::{Assignment, AssignmentProvider},
 	ParaId,
 };
 
@@ -316,14 +316,6 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 		}
 	}
 
-	fn get_provider_config(_core_idx: CoreIndex) -> AssignmentProviderConfig<BlockNumberFor<T>> {
-		let config = <configuration::Pallet<T>>::config();
-		AssignmentProviderConfig {
-			max_availability_timeouts: config.on_demand_retries,
-			ttl: config.on_demand_ttl,
-		}
-	}
-
 	#[cfg(any(feature = "runtime-benchmarks", test))]
 	fn get_mock_assignment(_: CoreIndex, para_id: primitives::Id) -> Assignment {
 		// Given that we are not tracking anything in `Bulk` assignments, it is safe to always
@@ -333,7 +325,7 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 
 	fn session_core_count() -> u32 {
 		let config = <configuration::Pallet<T>>::config();
-		config.coretime_cores
+		config.coretime_params.cores
 	}
 }
 
@@ -482,8 +474,8 @@ impl<T: Config> AssignCoretime for Pallet<T> {
 
 		// Add a new core and assign the para to it.
 		let mut config = <configuration::Pallet<T>>::config();
-		let core = config.coretime_cores;
-		config.coretime_cores.saturating_inc();
+		let core = config.coretime_params.cores;
+		config.coretime_params.cores.saturating_inc();
 
 		// `assign_coretime` is only called at genesis or by root, so setting the active
 		// config here is fine.

polkadot/runtime/parachains/src/assigner_on_demand/mock_helpers.rs

@@ -63,11 +63,12 @@ impl GenesisConfigBuilder {
 	pub(super) fn build(self) -> MockGenesisConfig {
 		let mut genesis = default_genesis_config();
 		let config = &mut genesis.configuration.config;
-		config.coretime_cores = self.on_demand_cores;
-		config.on_demand_base_fee = self.on_demand_base_fee;
-		config.on_demand_fee_variability = self.on_demand_fee_variability;
-		config.on_demand_queue_max_size = self.on_demand_max_queue_size;
-		config.on_demand_target_queue_utilization = self.on_demand_target_queue_utilization;
+		config.coretime_params.cores = self.on_demand_cores;
+		config.coretime_params.on_demand_base_fee = self.on_demand_base_fee;
+		config.coretime_params.on_demand_fee_variability = self.on_demand_fee_variability;
+		config.coretime_params.on_demand_queue_max_size = self.on_demand_max_queue_size;
+		config.coretime_params.on_demand_target_queue_utilization =
+			self.on_demand_target_queue_utilization;
 
 		let paras = &mut genesis.paras.paras;
 		for para_id in self.onboarded_on_demand_chains {

polkadot/runtime/parachains/src/assigner_on_demand/mod.rs

@@ -201,10 +201,10 @@ pub mod pallet {
 			let old_traffic = SpotTraffic::<T>::get();
 			match Self::calculate_spot_traffic(
 				old_traffic,
-				config.on_demand_queue_max_size,
+				config.coretime_params.on_demand_queue_max_size,
 				Self::queue_size(),
-				config.on_demand_target_queue_utilization,
-				config.on_demand_fee_variability,
+				config.coretime_params.on_demand_target_queue_utilization,
+				config.coretime_params.on_demand_fee_variability,
 			) {
 				Ok(new_traffic) => {
 					// Only update storage on change
@@ -330,8 +330,9 @@ where
 		let traffic = SpotTraffic::<T>::get();
 
 		// Calculate spot price
-		let spot_price: BalanceOf<T> =
-			traffic.saturating_mul_int(config.on_demand_base_fee.saturated_into::<BalanceOf<T>>());
+		let spot_price: BalanceOf<T> = traffic.saturating_mul_int(
+			config.coretime_params.on_demand_base_fee.saturated_into::<BalanceOf<T>>(),
+		);
 
 		// Is the current price higher than `max_amount`
 		ensure!(spot_price.le(&max_amount), Error::<T>::SpotPriceHigherThanMaxAmount);
@@ -450,7 +451,10 @@ where
 
 		OnDemandQueue::<T>::try_mutate(|queue| {
 			// Abort transaction if queue is too large
-			ensure!(Self::queue_size() < config.on_demand_queue_max_size, Error::<T>::QueueFull);
+			ensure!(
+				Self::queue_size() < config.coretime_params.on_demand_queue_max_size,
+				Error::<T>::QueueFull
+			);
 			match location {
 				QueuePushDirection::Back => queue.push_back(order),
 				QueuePushDirection::Front => queue.push_front(order),
@@ -472,7 +476,7 @@ where
 					target: LOG_TARGET,
 					"Failed to fetch the on demand queue size, returning the max size."
 				);
-				return config.on_demand_queue_max_size
+				return config.coretime_params.on_demand_queue_max_size
 			},
 		}
 	}

polkadot/runtime/parachains/src/assigner_parachains.rs

@@ -27,7 +27,7 @@ use primitives::CoreIndex;
 
 use crate::{
 	configuration, paras,
-	scheduler::common::{Assignment, AssignmentProvider, AssignmentProviderConfig},
+	scheduler::common::{Assignment, AssignmentProvider},
 };
 
 pub use pallet::*;
@@ -58,16 +58,6 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 	/// this is a no-op in the case of a bulk assignment slot.
 	fn push_back_assignment(_: Assignment) {}
 
-	fn get_provider_config(_core_idx: CoreIndex) -> AssignmentProviderConfig<BlockNumberFor<T>> {
-		AssignmentProviderConfig {
-			// The next assignment already goes to the same [`ParaId`], no timeout tracking needed.
-			max_availability_timeouts: 0,
-			// The next assignment already goes to the same [`ParaId`], this can be any number
-			// that's high enough to clear the time it takes to clear backing/availability.
-			ttl: 10u32.into(),
-		}
-	}
-
 	#[cfg(any(feature = "runtime-benchmarks", test))]
 	fn get_mock_assignment(_: CoreIndex, para_id: primitives::Id) -> Assignment {
 		Assignment::Bulk(para_id)

polkadot/runtime/parachains/src/assigner_parachains/mock_helpers.rs

@@ -60,11 +60,12 @@ impl GenesisConfigBuilder {
 	pub(super) fn build(self) -> MockGenesisConfig {
 		let mut genesis = default_genesis_config();
 		let config = &mut genesis.configuration.config;
-		config.coretime_cores = self.on_demand_cores;
-		config.on_demand_base_fee = self.on_demand_base_fee;
-		config.on_demand_fee_variability = self.on_demand_fee_variability;
-		config.on_demand_queue_max_size = self.on_demand_max_queue_size;
-		config.on_demand_target_queue_utilization = self.on_demand_target_queue_utilization;
+		config.coretime_params.cores = self.on_demand_cores;
+		config.coretime_params.on_demand_base_fee = self.on_demand_base_fee;
+		config.coretime_params.on_demand_fee_variability = self.on_demand_fee_variability;
+		config.coretime_params.on_demand_queue_max_size = self.on_demand_max_queue_size;
+		config.coretime_params.on_demand_target_queue_utilization =
+			self.on_demand_target_queue_utilization;
 
 		let paras = &mut genesis.paras.paras;
 		for para_id in self.onboarded_on_demand_chains {

polkadot/runtime/parachains/src/builder.rs

@@ -18,11 +18,7 @@ use crate::{
 	configuration, inclusion, initializer, paras,
 	paras::ParaKind,
 	paras_inherent,
-	scheduler::{
-		self,
-		common::{AssignmentProvider, AssignmentProviderConfig},
-		CoreOccupied, ParasEntry,
-	},
+	scheduler::{self, common::AssignmentProvider, CoreOccupied, ParasEntry},
 	session_info, shared,
 };
 use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
@@ -683,7 +679,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 		// We are currently in Session 0, so these changes will take effect in Session 2.
 		Self::setup_para_ids(used_cores);
 		configuration::ActiveConfig::<T>::mutate(|c| {
-			c.coretime_cores = used_cores;
+			c.coretime_params.cores = used_cores;
 		});
 
 		let validator_ids = Self::generate_validator_pairs(self.max_validators());
@@ -714,8 +710,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 		let cores = (0..used_cores)
 			.into_iter()
 			.map(|i| {
-				let AssignmentProviderConfig { ttl, .. } =
-					scheduler::Pallet::<T>::assignment_provider_config(CoreIndex(i));
+				let ttl = configuration::Pallet::<T>::config().coretime_params.ttl;
 				// Load an assignment into provider so that one is present to pop
 				let assignment = <T as scheduler::Config>::AssignmentProvider::get_mock_assignment(
 					CoreIndex(i),
@@ -730,8 +725,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 			let cores = (0..used_cores)
 				.into_iter()
 				.map(|i| {
-					let AssignmentProviderConfig { ttl, .. } =
-						scheduler::Pallet::<T>::assignment_provider_config(CoreIndex(i));
+					let ttl = configuration::Pallet::<T>::config().coretime_params.ttl;
 					// Load an assignment into provider so that one is present to pop
 					let assignment =
 						<T as scheduler::Config>::AssignmentProvider::get_mock_assignment(