diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs index c9eae2bf306acd45c27dbc46f491c2aa497dfd6f..a2c99166794139204a556c5fdf8a54933cc1f5c5 100644 --- a/pallets/membership/src/lib.rs +++ b/pallets/membership/src/lib.rs @@ -378,7 +378,7 @@ pub mod pallet { /// perform mebership expiration fn do_expire_membership(idty_id: T::IdtyId, expire_on: T::BlockNumber) -> Weight { - if let Some(_) = Membership::<T, I>::take(idty_id) { + if Membership::<T, I>::take(idty_id).is_some() { PendingMembership::<T, I>::insert(idty_id, T::MetaData::default()); PendingMembershipsExpireOn::<T, I>::append(expire_on, idty_id); } // else should not happen @@ -394,7 +394,7 @@ pub mod pallet { if let Ok(RawOrigin::Signed(account_id)) = origin.into() { T::IdtyIdOf::convert(account_id).ok_or_else(|| Error::<T, I>::IdtyIdNotFound.into()) } else { - return Err(BadOrigin.into()); + Err(BadOrigin.into()) } } /// perform the membership expiry scheduled at given block