Merge branch 'master' into ddc-CDC-T1

frame/conviction-voting/src/benchmarking.rs

@@ -147,8 +147,8 @@ benchmarks_instance_pallet! {
 	}
 
 	remove_other_vote {
-		let caller = funded_account::<T>("caller", 0);
-		let voter = funded_account::<T>("caller", 0);
+		let caller = funded_account::<T,I>("caller", 0);
+		let voter = funded_account::<T, I>("caller", 0);
 		let voter_lookup = T::Lookup::unlookup(voter.clone());
 		whitelist_account!(caller);
 		let old_account_vote = account_vote::<T, I>(100u32.into());
@@ -182,9 +182,9 @@ benchmarks_instance_pallet! {
 		let all_polls = fill_voting::<T, I>().1;
 		let class = T::Polls::max_ongoing().0;
 		let polls = &all_polls[&class];
-		let voter = funded_account::<T>("voter", 0);
+		let voter = funded_account::<T, I>("voter", 0);
 		let voter_lookup = T::Lookup::unlookup(voter.clone());
-		let caller = funded_account::<T>("caller", 0);
+		let caller = funded_account::<T, I>("caller", 0);
 		whitelist_account!(caller);
 
 		let delegated_balance: BalanceOf<T, I> = 1000u32.into();
@@ -210,9 +210,9 @@ benchmarks_instance_pallet! {
 		let all_polls = fill_voting::<T, I>().1;
 		let class = T::Polls::max_ongoing().0;
 		let polls = &all_polls[&class];
-		let voter = funded_account::<T>("voter", 0);
+		let voter = funded_account::<T, I>("voter", 0);
 		let voter_lookup = T::Lookup::unlookup(voter.clone());
-		let caller = funded_account::<T>("caller", 0);
+		let caller = funded_account::<T, I>("caller", 0);
 		whitelist_account!(caller);
 
 		let delegated_balance: BalanceOf<T, I> = 1000u32.into();
@@ -241,7 +241,7 @@ benchmarks_instance_pallet! {
 	}
 
 	unlock {
-		let caller = funded_account::<T>("caller", 0);
+		let caller = funded_account::<T, I>("caller", 0);
 		let caller_lookup = T::Lookup::unlookup(caller.clone());
 		whitelist_account!(caller);
 		let normal_account_vote = account_vote::<T, I>(T::Currency::free_balance(&caller) - 100u32.into());

frame/ranked-collective/src/lib.rs

@@ -474,17 +474,7 @@ pub mod pallet {
 		pub fn add_member(origin: OriginFor<T>, who: AccountIdLookupOf<T>) -> DispatchResult {
 			let _ = T::PromoteOrigin::ensure_origin(origin)?;
 			let who = T::Lookup::lookup(who)?;
-			ensure!(!Members::<T, I>::contains_key(&who), Error::<T, I>::AlreadyMember);
-			let index = MemberCount::<T, I>::get(0);
-			let count = index.checked_add(1).ok_or(Overflow)?;
-
-			Members::<T, I>::insert(&who, MemberRecord { rank: 0 });
-			IdToIndex::<T, I>::insert(0, &who, index);
-			IndexToId::<T, I>::insert(0, index, &who);
-			MemberCount::<T, I>::insert(0, count);
-			Self::deposit_event(Event::MemberAdded { who });
-
-			Ok(())
+			Self::do_add_member(who)
 		}
 
 		/// Increment the rank of an existing member by one.
@@ -497,17 +487,7 @@ pub mod pallet {
 		pub fn promote_member(origin: OriginFor<T>, who: AccountIdLookupOf<T>) -> DispatchResult {
 			let max_rank = T::PromoteOrigin::ensure_origin(origin)?;
 			let who = T::Lookup::lookup(who)?;
-			let record = Self::ensure_member(&who)?;
-			let rank = record.rank.checked_add(1).ok_or(Overflow)?;
-			ensure!(max_rank >= rank, Error::<T, I>::NoPermission);
-			let index = MemberCount::<T, I>::get(rank);
-			MemberCount::<T, I>::insert(rank, index.checked_add(1).ok_or(Overflow)?);
-			IdToIndex::<T, I>::insert(rank, &who, index);
-			IndexToId::<T, I>::insert(rank, index, &who);
-			Members::<T, I>::insert(&who, MemberRecord { rank });
-			Self::deposit_event(Event::RankChanged { who, rank });
-
-			Ok(())
+			Self::do_promote_member(who, Some(max_rank))
 		}
 
 		/// Decrement the rank of an existing member by one. If the member is already at rank zero,