Merge branch 'master' into ddc-CDC-T1

frame/elections-phragmen/src/lib.rs

@@ -504,7 +504,8 @@ pub mod pallet {
 		pub fn remove_member(
 			origin: OriginFor<T>,
 			who: AccountIdLookupOf<T>,
-			has_replacement: bool,
+			slash_bond: bool,
+			rerun_election: bool,
 		) -> DispatchResultWithPostInfo {
 			ensure_root(origin)?;
 			let who = T::Lookup::lookup(who)?;

frame/nomination-pools/src/lib.rs

@@ -281,8 +281,9 @@ use frame_support::{
 };
 use scale_info::TypeInfo;
 use sp_core::U256;
-use sp_runtime::traits::{
-	AccountIdConversion, Bounded, CheckedSub, Convert, Saturating, StaticLookup, Zero,
+use sp_runtime::{
+	traits::{AccountIdConversion, Bounded, CheckedAdd, CheckedSub, Convert, Saturating, StaticLookup, Zero},
+	FixedPointNumber, FixedPointOperand,
 };
 use sp_staking::{EraIndex, OnStakerSlash, StakingInterface};
 use sp_std::{collections::btree_map::BTreeMap, fmt::Debug, ops::Div, vec::Vec};
@@ -1638,8 +1639,8 @@ pub mod pallet {
 			member_account: AccountIdLookupOf<T>,
 			#[pallet::compact] unbonding_points: BalanceOf<T>,
 		) -> DispatchResult {
-			let caller = ensure_signed(origin)?;
-			let member_account = T::Lookup::lookup(member_account)?;
+			let who = ensure_signed(origin)?;
+      let member_account = T::Lookup::lookup(member_account)?;
 			let (mut member, mut bonded_pool, mut reward_pool) =
 				Self::get_member_with_pools(&member_account)?;