Skip to content
Snippets Groups Projects
Commit bbd4f053 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

refac(smith-members): authority-members OnBlacklistedMember is no more used

parent 22e5e9b3
No related branches found
No related tags found
No related merge requests found
Pipeline #35028 failed
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#![allow(clippy::type_complexity)] #![allow(clippy::type_complexity)]
use super::pallet::*; use super::pallet::*;
use crate::OnBlacklistedMember;
use frame_support::pallet_prelude::Weight; use frame_support::pallet_prelude::Weight;
use frame_support::traits::Get; use frame_support::traits::Get;
use pallet_offences::traits::OnOffenceHandler; use pallet_offences::traits::OnOffenceHandler;
...@@ -55,7 +54,6 @@ where ...@@ -55,7 +54,6 @@ where
SlashStrategy::Blacklist => { SlashStrategy::Blacklist => {
for offender in offenders { for offender in offenders {
if let Some(member_id) = T::MemberIdOf::convert(offender.offender.0.clone()) { if let Some(member_id) = T::MemberIdOf::convert(offender.offender.0.clone()) {
T::OnBlacklistedMember::on_blacklisted_member(member_id);
Blacklist::<T>::mutate(|blacklist| { Blacklist::<T>::mutate(|blacklist| {
if !blacklist.contains(&member_id) { if !blacklist.contains(&member_id) {
blacklist.push(member_id); blacklist.push(member_id);
......
...@@ -71,7 +71,6 @@ pub mod pallet { ...@@ -71,7 +71,6 @@ pub mod pallet {
type OnNewSession: OnNewSession; type OnNewSession: OnNewSession;
type OnOutgoingMember: OnOutgoingMember<Self::MemberId>; type OnOutgoingMember: OnOutgoingMember<Self::MemberId>;
type OnIncomingMember: OnIncomingMember<Self::MemberId>; type OnIncomingMember: OnIncomingMember<Self::MemberId>;
type OnBlacklistedMember: OnBlacklistedMember<Self::MemberId>;
/// Max number of authorities allowed /// Max number of authorities allowed
#[pallet::constant] #[pallet::constant]
type MaxAuthorities: Get<u32>; type MaxAuthorities: Get<u32>;
......
...@@ -159,7 +159,6 @@ impl pallet_authority_members::Config for Test { ...@@ -159,7 +159,6 @@ impl pallet_authority_members::Config for Test {
type RemoveMemberOrigin = system::EnsureRoot<u64>; type RemoveMemberOrigin = system::EnsureRoot<u64>;
type RuntimeEvent = RuntimeEvent; type RuntimeEvent = RuntimeEvent;
type WeightInfo = (); type WeightInfo = ();
type OnBlacklistedMember = ();
type OnIncomingMember = (); type OnIncomingMember = ();
type OnOutgoingMember = (); type OnOutgoingMember = ();
} }
......
...@@ -24,15 +24,6 @@ impl OnNewSession for () { ...@@ -24,15 +24,6 @@ impl OnNewSession for () {
fn on_new_session(_: SessionIndex) {} fn on_new_session(_: SessionIndex) {}
} }
/// Handle the consequences of a blacklisting for other pallets
pub trait OnBlacklistedMember<MemberId> {
fn on_blacklisted_member(member_id: MemberId);
}
/// By default: no consequences
impl<MemberId> OnBlacklistedMember<MemberId> for () {
fn on_blacklisted_member(_: MemberId) {}
}
/// Handle the consequences of going in the authority set for other pallets. /// Handle the consequences of going in the authority set for other pallets.
/// Typically, a smith won't expire as long as he is in the authority set. /// Typically, a smith won't expire as long as he is in the authority set.
pub trait OnIncomingMember<MemberId> { pub trait OnIncomingMember<MemberId> {
......
...@@ -190,7 +190,6 @@ impl pallet_authority_members::Config for Test { ...@@ -190,7 +190,6 @@ impl pallet_authority_members::Config for Test {
type WeightInfo = (); type WeightInfo = ();
type OnOutgoingMember = (); type OnOutgoingMember = ();
type OnIncomingMember = (); type OnIncomingMember = ();
type OnBlacklistedMember = ();
} }
parameter_types! { parameter_types! {
......
...@@ -5,18 +5,6 @@ use pallet_identity::IdtyEvent; ...@@ -5,18 +5,6 @@ use pallet_identity::IdtyEvent;
use sp_runtime::traits::Convert; use sp_runtime::traits::Convert;
// TODO: /// or //! ? // TODO: /// or //! ?
/// We want to remove a Smith when he is removed (blacklisted) from the higher level set of "authorities".
/// A blacklisting means the user does not respect the operational conditions for an authority, so
/// he does not deserve the Smith role.
impl<T: Config> pallet_authority_members::OnBlacklistedMember<T::MemberId> for Pallet<T> {
fn on_blacklisted_member(member_id: T::MemberId) {
Pallet::<T>::smith_goes_blacklisted(
T::IdtyIdOfAuthorityId::convert(member_id).expect("convertion should be ok"),
);
}
}
///
impl<T: Config> pallet_authority_members::OnOutgoingMember<T::MemberId> for Pallet<T> { impl<T: Config> pallet_authority_members::OnOutgoingMember<T::MemberId> for Pallet<T> {
fn on_outgoing_member(member_id: T::MemberId) { fn on_outgoing_member(member_id: T::MemberId) {
Pallet::<T>::smith_goes_offline( Pallet::<T>::smith_goes_offline(
......
...@@ -531,15 +531,6 @@ impl<T: Config> Pallet<T> { ...@@ -531,15 +531,6 @@ impl<T: Config> Pallet<T> {
} }
} }
// TODO: return what?
fn smith_goes_blacklisted(_idty_index: T::IdtyIndex) {
// TODO: for now, just let smith_goes_offline do the job
// if let Some(_) = Smiths::<T>::get(idty_index) {
// Smiths::<T>::remove(idty_index);
// T::OnSmithDelete::on_smith_delete(idty_index, SmithRemovalReason::Blacklisted);
// }
}
fn provide_is_member(idty_id: &T::IdtyIndex) -> bool { fn provide_is_member(idty_id: &T::IdtyIndex) -> bool {
let Some(smith) = Smiths::<T>::get(idty_id) else { let Some(smith) = Smiths::<T>::get(idty_id) else {
return false; return false;
......
...@@ -240,7 +240,6 @@ macro_rules! pallets_config { ...@@ -240,7 +240,6 @@ macro_rules! pallets_config {
type MaxAuthorities = MaxAuthorities; type MaxAuthorities = MaxAuthorities;
type RemoveMemberOrigin = EnsureRoot<Self::AccountId>; type RemoveMemberOrigin = EnsureRoot<Self::AccountId>;
type WeightInfo = common_runtime::weights::pallet_authority_members::WeightInfo<Runtime>; type WeightInfo = common_runtime::weights::pallet_authority_members::WeightInfo<Runtime>;
type OnBlacklistedMember = SmithMembers;
type OnIncomingMember = SmithMembers; type OnIncomingMember = SmithMembers;
type OnOutgoingMember = SmithMembers; type OnOutgoingMember = SmithMembers;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment