Use a better data structure for SignedSubmissions instead of Vec

frame/election-provider-multi-phase/src/lib.rs

@@ -518,7 +518,7 @@ pub use pallet::*;
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::pallet_prelude::*;
+	use frame_support::{pallet_prelude::*, storage::bounded_btree_set::BoundedBTreeSet};
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::config]
@@ -562,6 +562,7 @@ pub mod pallet {
 		/// Maximum number of signed submissions that can be queued.
 		#[pallet::constant]
 		type SignedMaxSubmissions: Get<u32>;
+
 		/// Maximum weight of a signed solution.
 		///
 		/// This should probably be similar to [`Config::MinerMaxWeight`].
@@ -1039,12 +1040,15 @@ pub mod pallet {
 	#[pallet::getter(fn snapshot_metadata)]
 	pub type SnapshotMetadata<T: Config> = StorageValue<_, SolutionOrSnapshotSize>;
 
-	/// Sorted (worse -> best) list of unchecked, signed solutions.
+	/// Sorted set of unchecked, signed solutions.
 	#[pallet::storage]
 	#[pallet::getter(fn signed_submissions)]
 	pub type SignedSubmissions<T: Config> = StorageValue<
 		_,
-		Vec<SignedSubmission<T::AccountId, BalanceOf<T>, CompactOf<T>>>,
+		BoundedBTreeSet<
+			SignedSubmission<T::AccountId, BalanceOf<T>, CompactOf<T>>,
+			T::SignedMaxSubmissions,
+		>,
 		ValueQuery,
 	>;
 

frame/election-provider-multi-phase/src/signed.rs

@@ -43,12 +43,42 @@ pub struct SignedSubmission<AccountId, Balance: HasCompact, CompactSolution> {
 	pub solution: RawSolution<CompactSolution>,
 }
 
-pub(crate) type BalanceOf<T> =
+impl<AccountId, Balance, CompactSolution> Ord
+	for SignedSubmission<AccountId, Balance, CompactSolution>
+where
+	AccountId: Ord,
+	Balance: Ord + HasCompact,
+	CompactSolution: Ord,
+{
+	fn cmp(&self, other: &Self) -> Ordering {
+		self.solution
+			.score
+			.cmp(&other.solution.score)
+			.and_then(|| self.solution.cmp(&other.solution))
+			.and_then(|| self.deposit.cmp(&other.deposit))
+			.and_then(|| self.reward.cmp(&other.reward))
+			.and_then(|| self.who.cmp(&other.who))
+	}
+}
+
+impl<AccountId, Balance, CompactSolution> PartialOrd
+	for SignedSubmission<AccountId, Balance, CompactSolution>
+where
+	AccountId: Ord,
+	Balance: Ord + HasCompact,
+	CompactSolution: Ord,
+{
+	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+		Some(self.cmp(other))
+	}
+}
+
+pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-pub(crate) type PositiveImbalanceOf<T> = <<T as Config>::Currency as Currency<
+pub type PositiveImbalanceOf<T> = <<T as Config>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::PositiveImbalance;
-pub(crate) type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
+pub type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;