Fix a round of compilation errors

Author: tdimitrov

substrate/frame/staking/src/lib.rs

@@ -1346,24 +1346,6 @@ impl<T: Config> Contains<T::AccountId> for AllStakers<T> {
 	}
 }
 
-/// A utility struct that provides a way to check if a given account is a staker.
-///
-/// This struct implements the `Contains` trait, allowing it to determine whether
-/// a particular account is currently staking by checking if the account exists in
-/// the staking ledger.
-pub struct AllStakers<T: Config>(core::marker::PhantomData<T>);
-
-impl<T: Config> Contains<T::AccountId> for AllStakers<T> {
-	/// Checks if the given account ID corresponds to a staker.
-	///
-	/// # Returns
-	/// - `true` if the account has an entry in the staking ledger (indicating it is staking).
-	/// - `false` otherwise.
-	fn contains(account: &T::AccountId) -> bool {
-		Ledger::<T>::contains_key(account)
-	}
-}
-
 /// Configurations of the benchmarking of the pallet.
 pub trait BenchmarkingConfig {
 	/// The maximum number of validators to use.

substrate/frame/staking/src/pallet/mod.rs

@@ -53,9 +53,10 @@ pub use impls::*;
 
 use crate::{
 	asset, slashing, weights::WeightInfo, AccountIdLookupOf, ActiveEraInfo, BalanceOf, EraPayout,
-	EraRewardPoints, ExposurePage, Forcing, LedgerIntegrityState, MaxNominationsOf,
-	NegativeImbalanceOf, Nominations, NominationsQuota, PositiveImbalanceOf, RewardDestination,
-	SessionInterface, StakingLedger, UnappliedSlash, UnlockChunk, ValidatorPrefs,
+	EraRewardPoints, Exposure, ExposurePage, Forcing, LedgerIntegrityState, MaxNominationsOf,
+	NegativeImbalanceOf, Nominations, NominationsQuota, OffenceSeverity, PositiveImbalanceOf,
+	RewardDestination, SessionInterface, StakingLedger, UnappliedSlash, UnlockChunk,
+	ValidatorPrefs,
 };
 
 // The speculative number of spans are used as an input of the weight annotation of

substrate/frame/staking/src/slashing.rs

@@ -314,7 +314,7 @@ fn kick_out_if_recent<T: Config>(params: SlashParams<T>) {
 		// Check https://github.com/paritytech/polkadot-sdk/issues/2650 for details
 		spans.end_span(params.now);
 	}
-
+}
 
 /// Slash nominators. Accepts general parameters and the prior slash percentage of the validator.
 ///

substrate/frame/staking/src/weights.rs

@@ -50,7 +50,7 @@ where
 {
 	let mut staked = assignment_ratio_to_staked(ratio, &stake_of);
 	staked.iter_mut().try_for_each(|a| {
-		a.try_normalize(stake_of(&a.who).into()).map_err(Error::ArithmeticError)
+		a.try_normalize(stake_of(&a.who).into()).map_err(|_| Error::ArithmeticError)
 	})?;
 	Ok(staked)
 }
@@ -70,7 +70,7 @@ pub fn assignment_staked_to_ratio_normalized<A: IdentifierT, P: PerThing128>(
 ) -> Result<Vec<Assignment<A, P>>, Error> {
 	let mut ratio = staked.into_iter().map(|a| a.into_assignment()).collect::<Vec<_>>();
 	for assignment in ratio.iter_mut() {
-		assignment.try_normalize().map_err(Error::ArithmeticError)?;
+		assignment.try_normalize().map_err(|_| Error::ArithmeticError)?;
 	}
 	Ok(ratio)
 }

substrate/primitives/npos-elections/src/helpers.rs

@@ -131,7 +131,7 @@ pub enum Error {
 	/// One of the page indices was invalid.
 	SolutionInvalidPageIndex,
 	/// An error occurred in some arithmetic operation.
-	ArithmeticError(&'static str),
+	ArithmeticError,
 	/// The data provided to create support map was invalid.
 	InvalidSupportEdge,
 	/// The number of voters is bigger than the `MaxVoters` bound.

substrate/primitives/npos-elections/src/lib.rs

@@ -97,7 +97,7 @@ pub fn seq_phragmen<AccountId: IdentifierT, P: PerThing128>(
 		voters.into_iter().filter_map(|v| v.into_assignment()).collect::<Vec<_>>();
 	let _ = assignments
 		.iter_mut()
-		.try_for_each(|a| a.try_normalize().map_err(crate::Error::ArithmeticError))?;
+		.try_for_each(|a| a.try_normalize().map_err(|_| crate::Error::ArithmeticError))?;
 	let winners = winners
 		.into_iter()
 		.map(|w_ptr| (w_ptr.borrow().who.clone(), w_ptr.borrow().backed_stake))
@@ -205,7 +205,7 @@ pub fn seq_phragmen_core<AccountId: IdentifierT>(
 		// edge of all candidates that eventually have a non-zero weight must be elected.
 		debug_assert!(voter.edges.iter().all(|e| e.candidate.borrow().elected));
 		// inc budget to sum the budget.
-		voter.try_normalize_elected().map_err(crate::Error::ArithmeticError)?;
+		voter.try_normalize_elected().map_err(|_| crate::Error::ArithmeticError)?;
 	}
 
 	Ok((candidates, voters))

substrate/primitives/npos-elections/src/phragmen.rs

@@ -71,7 +71,7 @@ pub fn phragmms<AccountId: IdentifierT, P: PerThing128>(
 	let _ = assignments
 		.iter_mut()
 		.try_for_each(|a| a.try_normalize())
-		.map_err(crate::Error::ArithmeticError)?;
+		.map_err(|_| crate::Error::ArithmeticError)?;
 	let winners = winners
 		.into_iter()
 		.map(|w_ptr| (w_ptr.borrow().who.clone(), w_ptr.borrow().backed_stake))