Skip to content
Snippets Groups Projects
Unverified Commit 868198d1 authored by bgallois's avatar bgallois
Browse files

remove unnecessary ownership

parent b202881c
No related branches found
No related tags found
No related merge requests found
Pipeline #39941 passed
......@@ -258,17 +258,17 @@ pub mod pallet {
if !Members::<T>::contains_key(member_id) {
return Err(Error::<T>::MemberNotFound.into());
}
if Self::is_outgoing(member_id) {
if Self::is_outgoing(&member_id) {
return Err(Error::<T>::AlreadyOutgoing.into());
}
let is_incoming = Self::is_incoming(member_id);
if !is_incoming && !Self::is_online(member_id) {
let is_incoming = Self::is_incoming(&member_id);
if !is_incoming && !Self::is_online(&member_id) {
return Err(Error::<T>::NotOnlineNorIncoming.into());
}
// Apply phase //
if is_incoming {
Self::remove_in(member_id);
Self::remove_in(&member_id);
} else {
Self::insert_out(member_id);
}
......@@ -284,7 +284,7 @@ pub mod pallet {
let who = ensure_signed(origin)?;
let member_id = Self::verify_ownership_and_membership(&who)?;
if Self::is_blacklisted(member_id) {
if Self::is_blacklisted(&member_id) {
return Err(Error::<T>::MemberBlacklisted.into());
}
if !Members::<T>::contains_key(member_id) {
......@@ -296,11 +296,11 @@ pub mod pallet {
return Err(Error::<T>::SessionKeysNotProvided.into());
}
if Self::is_incoming(member_id) {
if Self::is_incoming(&member_id) {
return Err(Error::<T>::AlreadyIncoming.into());
}
let is_outgoing = Self::is_outgoing(member_id);
if Self::is_online(member_id) && !is_outgoing {
let is_outgoing = Self::is_outgoing(&member_id);
if Self::is_online(&member_id) && !is_outgoing {
return Err(Error::<T>::AlreadyOnline.into());
}
if Self::authorities_counter() >= T::MaxAuthorities::get() {
......@@ -309,7 +309,7 @@ pub mod pallet {
// Apply phase //
if is_outgoing {
Self::remove_out(member_id);
Self::remove_out(&member_id);
} else {
Self::insert_in(member_id);
}
......@@ -427,14 +427,14 @@ pub mod pallet {
impl<T: Config> Pallet<T> {
/// Perform authority member removal.
fn do_remove_member(member_id: T::MemberId, owner_key: T::AccountId) {
if Self::is_online(member_id) {
if Self::is_online(&member_id) {
// Trigger the member deletion for next session
Self::insert_out(member_id);
}
// remove all member data
Self::remove_in(member_id);
Self::remove_online(member_id);
Self::remove_in(&member_id);
Self::remove_online(&member_id);
Members::<T>::remove(member_id);
// Purge session keys
......@@ -485,53 +485,53 @@ pub mod pallet {
}
/// Check if member is incoming.
fn is_incoming(member_id: T::MemberId) -> bool {
fn is_incoming(member_id: &T::MemberId) -> bool {
IncomingAuthorities::<T>::get()
.binary_search(&member_id)
.binary_search(member_id)
.is_ok()
}
/// C&heck if member is online.
fn is_online(member_id: T::MemberId) -> bool {
fn is_online(member_id: &T::MemberId) -> bool {
OnlineAuthorities::<T>::get()
.binary_search(&member_id)
.binary_search(member_id)
.is_ok()
}
/// Check if member is outgoing.
fn is_outgoing(member_id: T::MemberId) -> bool {
fn is_outgoing(member_id: &T::MemberId) -> bool {
OutgoingAuthorities::<T>::get()
.binary_search(&member_id)
.binary_search(member_id)
.is_ok()
}
/// Check if member is blacklisted.
fn is_blacklisted(member_id: T::MemberId) -> bool {
Blacklist::<T>::get().contains(&member_id)
fn is_blacklisted(member_id: &T::MemberId) -> bool {
Blacklist::<T>::get().contains(member_id)
}
/// Perform removal from incoming authorities.
fn remove_in(member_id: T::MemberId) {
fn remove_in(member_id: &T::MemberId) {
IncomingAuthorities::<T>::mutate(|members_ids| {
if let Ok(index) = members_ids.binary_search(&member_id) {
if let Ok(index) = members_ids.binary_search(member_id) {
members_ids.remove(index);
}
})
}
/// Perform removal from online authorities.
fn remove_online(member_id: T::MemberId) {
fn remove_online(member_id: &T::MemberId) {
OnlineAuthorities::<T>::mutate(|members_ids| {
if let Ok(index) = members_ids.binary_search(&member_id) {
if let Ok(index) = members_ids.binary_search(member_id) {
members_ids.remove(index);
}
});
}
/// Perform removal from outgoing authorities.
fn remove_out(member_id: T::MemberId) {
fn remove_out(member_id: &T::MemberId) {
OutgoingAuthorities::<T>::mutate(|members_ids| {
if let Ok(index) = members_ids.binary_search(&member_id) {
if let Ok(index) = members_ids.binary_search(member_id) {
members_ids.remove(index);
}
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment