Resolving Compile Errors in Core Time Prep Tests

polkadot/runtime/parachains/src/assigner.rs

@@ -56,8 +56,7 @@ pub mod pallet {
 }
 
 /// Assignments as of this top-level assignment provider.
-#[derive(Encode, Decode, TypeInfo, RuntimeDebug)]
-// Generic arguments, because instance generation of above traits breaks with generic `T` parameter.
+#[derive(Encode, Decode, TypeInfo, RuntimeDebug, PartialEq, Clone)]
 pub enum UnifiedAssignment<OnDemand, Legacy> {
 	/// Assignment came from on-demand assignment provider.
 	#[codec(index = 0)]

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

@@ -110,26 +110,41 @@ pub enum SpotTrafficCalculationErr {
 }
 
 /// Assignments as provided by the on-demand `AssignmentProvider`.
-#[derive(RuntimeDebug, Encode, Decode, TypeInfo)]
+#[derive(RuntimeDebug, Encode, Decode, TypeInfo, PartialEq, Clone)]
 pub struct OnDemandAssignment {
 	/// The assigned para id.
 	para_id: ParaId,
 	/// The core index the para got assigned to.
 	core_index: CoreIndex,
 }
 
+#[cfg(test)]
+impl OnDemandAssignment {
+	pub fn new(para_id: ParaId, core_index: CoreIndex) -> Self {
+		Self { para_id, core_index }
+	}
+}
+
 impl Assignment for OnDemandAssignment {
 	fn para_id(&self) -> ParaId {
 		self.para_id
 	}
 }
 
 /// Internal representation of an order after it has been enqueued already.
-#[derive(Encode, Decode, TypeInfo)]
+#[cfg(not(test))]
+#[derive(Encode, Decode, TypeInfo, Debug, PartialEq)]
 pub(super) struct EnqueuedOrder {
 	pub para_id: ParaId,
 }
 
+// Looser encapsulation for tests
+#[cfg(test)]
+#[derive(Encode, Decode, TypeInfo, Debug, PartialEq)]
+pub(crate) struct EnqueuedOrder {
+	pub para_id: ParaId,
+}
+
 impl EnqueuedOrder {
 	pub fn new(para_id: ParaId) -> Self {
 		Self { para_id }
@@ -471,6 +486,7 @@ where
 	/// Errors:
 	/// - `InvalidParaId`
 	/// - `QueueFull`
+	#[cfg(not(test))]
 	fn add_on_demand_order(
 		order: EnqueuedOrder,
 		location: QueuePushDirection,
@@ -491,6 +507,27 @@ where
 		})
 	}
 
+	#[cfg(test)]
+	pub fn add_on_demand_order(
+		order: EnqueuedOrder,
+		location: QueuePushDirection,
+	) -> Result<(), DispatchError> {
+		// Only parathreads are valid paraids for on the go parachains.
+		ensure!(<paras::Pallet<T>>::is_parathread(order.para_id), Error::<T>::InvalidParaId);
+
+		let config = <configuration::Pallet<T>>::config();
+
+		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);
+			match location {
+				QueuePushDirection::Back => queue.push_back(order),
+				QueuePushDirection::Front => queue.push_front(order),
+			};
+			Ok(())
+		})
+	}
+
 	/// Get the size of the on demand queue.
 	///
 	/// Returns:
@@ -511,7 +548,7 @@ where
 
 	/// Getter for the order queue.
 	#[cfg(test)]
-	fn get_queue() -> VecDeque<EnqueuedOrder> {
+	pub fn get_queue() -> VecDeque<EnqueuedOrder> {
 		OnDemandQueue::<T>::get()
 	}