fix(pallet-communities): on tests, must unlock on casted votes

pallets/communities/src/functions.rs

@@ -122,7 +122,7 @@ impl<T: Config> Pallet<T> {
 			let (tally, class) = poll_status.ensure_ongoing().ok_or(Error::<T>::NotOngoing)?;
 			ensure!(community_id == class, Error::<T>::InvalidTrack);
 
-			let (vote, _) = CommunityVotes::<T>::get(poll_index, membership_id).ok_or(Error::<T>::NoVoteCasted)?;
+			let (vote, voter) = CommunityVotes::<T>::get(poll_index, membership_id).ok_or(Error::<T>::NoVoteCasted)?;
 			let vote_multiplier = match CommunityDecisionMethod::<T>::get(community_id) {
 				DecisionMethod::Rank => T::MemberMgmt::rank_of(&community_id, &membership_id)
 					.unwrap_or_default()
@@ -133,16 +133,11 @@ impl<T: Config> Pallet<T> {
 			let vote_weight = VoteWeight::from(&vote);
 			tally.remove_vote(vote.say(), vote_multiplier * vote_weight, vote_weight);
 
-			Self::do_unlock(membership_id, poll_index)
+			CommunityVotes::<T>::remove(poll_index, membership_id);
+			Self::update_locks(&voter, poll_index, &vote, LockUpdateType::Remove)
 		})
 	}
 
-	pub(crate) fn do_unlock(membership_id: MembershipIdOf<T>, poll_index: PollIndexOf<T>) -> DispatchResult {
-		let (vote, voter) = CommunityVotes::<T>::get(poll_index, membership_id).ok_or(Error::<T>::NoVoteCasted)?;
-		CommunityVotes::<T>::remove(poll_index, membership_id);
-		Self::update_locks(&voter, poll_index, &vote, LockUpdateType::Remove)
-	}
-
 	pub(crate) fn update_locks(
 		who: &AccountIdOf<T>,
 		poll_index: PollIndexOf<T>,

pallets/communities/src/lib.rs

@@ -525,7 +525,8 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 			T::MemberMgmt::check_membership(&who, &membership_id).ok_or(Error::<T>::NotAMember)?;
 			ensure!(T::Polls::as_ongoing(poll_index).is_none(), Error::<T>::AlreadyOngoing);
-			Self::do_unlock(membership_id, poll_index)
+			let vote = CommunityVoteLocks::<T>::get(&who, poll_index).ok_or(Error::<T>::NoLocksInPlace)?;
+			Self::update_locks(&who, poll_index, &vote, LockUpdateType::Remove)
 		}
 
 		/// Dispatch a callable as the community account

pallets/communities/src/tests/governance.rs

@@ -1171,13 +1171,13 @@ mod unlock {
 
 			assert_ok!(Communities::unlock(
 				RuntimeOrigin::signed(BOB),
-				membership(COMMUNITY_C, 2),
+				membership(COMMUNITY_B, 1),
 				1
 			));
 
 			assert_ok!(Communities::unlock(
 				RuntimeOrigin::signed(CHARLIE),
-				membership(COMMUNITY_D, 3),
+				membership(COMMUNITY_C, 3),
 				2
 			));
 		});