use derived Ord

Author: AmbientTea

toolkit/primitives/authority-selection-inherents/src/filter_invalid_candidates.rs

@@ -22,7 +22,7 @@ pub struct RegisterValidatorSignedMessage {
 	pub registration_utxo: UtxoId,
 }
 
-#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq)]
+#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, PartialOrd, Ord)]
 pub struct CandidateWithStake<TAccountId, TAccountKeys> {
 	pub stake_pool_pub_key: StakePoolPublicKey,
 	/// Amount of ADA staked/locked by the Authority Candidate
@@ -31,29 +31,18 @@ pub struct CandidateWithStake<TAccountId, TAccountKeys> {
 	pub account_keys: TAccountKeys,
 }
 
-#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq)]
+#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, PartialOrd, Ord)]
 pub struct PermissionedCandidate<TAccountId, TAccountKeys> {
 	pub account_id: TAccountId,
 	pub account_keys: TAccountKeys,
 }
 
-#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq)]
+#[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Candidate<TAccountId, TAccountKeys> {
 	Permissioned(PermissionedCandidate<TAccountId, TAccountKeys>),
 	Registered(CandidateWithStake<TAccountId, TAccountKeys>),
 }
 
-impl<TAccountId: Ord, TAccountKeys: Eq> PartialOrd for Candidate<TAccountId, TAccountKeys> {
-	fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
-		Some(self.cmp(other))
-	}
-}
-impl<TAccountId: Ord, TAccountKeys: Eq> Ord for Candidate<TAccountId, TAccountKeys> {
-	fn cmp(&self, other: &Self) -> core::cmp::Ordering {
-		self.account_id().cmp(other.account_id())
-	}
-}
-
 impl<AuthorityId, AuthorityKeys> From<Candidate<AuthorityId, AuthorityKeys>>
 	for CommitteeMember<AuthorityId, AuthorityKeys>
 {

toolkit/primitives/domain/src/lib.rs

@@ -60,7 +60,9 @@ impl Display for McEpochNumber {
 	}
 }
 /// Amount of Lovelace (which is a fraction of 1 ADA) staked/locked on Cardano
-#[derive(Default, Clone, Copy, Debug, Encode, Decode, TypeInfo, ToDatum, PartialEq, Eq)]
+#[derive(
+	Default, Clone, Copy, Debug, Encode, Decode, TypeInfo, ToDatum, PartialEq, Eq, PartialOrd, Ord,
+)]
 #[cfg_attr(feature = "serde", derive(Serialize))]
 pub struct StakeDelegation(pub u64);