Skip to content
Snippets Groups Projects
Commit f312f70d authored by bgallois's avatar bgallois Committed by Hugo Trentesaux
Browse files

refactore remove_member_from_blacklist

parent 29f6263e
No related branches found
No related tags found
1 merge request!161Offences management
...@@ -365,13 +365,15 @@ pub mod pallet { ...@@ -365,13 +365,15 @@ pub mod pallet {
member_id: T::MemberId, member_id: T::MemberId,
) -> DispatchResultWithPostInfo { ) -> DispatchResultWithPostInfo {
T::RemoveMemberOrigin::ensure_origin(origin)?; T::RemoveMemberOrigin::ensure_origin(origin)?;
BlackList::<T>::mutate(|members_ids| {
let _ = BlackList::<T>::get() if let Ok(index) = members_ids.binary_search(&member_id) {
.binary_search(&member_id) members_ids.remove(index);
.err() Self::deposit_event(Event::MemberRemovedFromBlackList(member_id));
.ok_or(Error::<T>::MemberNotBlackListed);
Self::remove_blacklist(member_id);
Ok(().into()) Ok(().into())
} else {
Err(Error::<T>::MemberNotBlackListed.into())
}
})
} }
} }
...@@ -552,15 +554,6 @@ pub mod pallet { ...@@ -552,15 +554,6 @@ pub mod pallet {
} }
}); });
} }
/// perform removal from blacklist
fn remove_blacklist(member_id: T::MemberId) {
BlackList::<T>::mutate(|members_ids| {
if let Ok(index) = members_ids.binary_search(&member_id) {
members_ids.remove(index);
}
});
Self::deposit_event(Event::MemberRemovedFromBlackList(member_id));
}
/// check that accountid is member /// check that accountid is member
fn verify_ownership_and_membership( fn verify_ownership_and_membership(
who: &T::AccountId, who: &T::AccountId,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment