also fix benchmark code

pallets/authority-members/src/lib.rs

@@ -299,7 +299,7 @@ pub mod pallet {
             let member_id = Self::verify_ownership_and_membership(&who)?;
 
             let _post_info = pallet_session::Call::<T>::set_keys {
-                keys: keys.into(),
+                keys,
                 proof: vec![],
             }
             .dispatch_bypass_filter(origin)?;

pallets/identity/src/benchmarking.rs

@@ -87,7 +87,7 @@ fn create_dummy_identity<T: Config>(i: u32) -> Result<(), &'static str> {
     <Identities<T>>::insert(idty_index, value);
     IdentitiesRemovableOn::<T>::append(removable_on, (idty_index, IdtyStatus::Created));
     IdentityIndexOf::<T>::insert(owner_key.clone(), idty_index);
-    <IdentitiesNames<T>>::insert(idty_name.clone(), ());
+    <IdentitiesNames<T>>::insert(idty_name.clone(), idty_index);
     Ok(())
 }
 

pallets/membership/src/benchmarking.rs

@@ -46,7 +46,7 @@ benchmarks_instance_pallet! {
         let caller: T::AccountId = T::AccountIdOf::convert(idty.clone()).unwrap();
         let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
         // Lazily prepare call as this extrinsic will always return an errror when in subwot
-        let call = Call::<T, I>::request_membership { metadata: T::MetaData ::default()};
+        let call = Call::<T, I>::request_membership { };
     }: {
         call.dispatch_bypass_filter(caller_origin).ok();
     }
@@ -58,7 +58,7 @@ benchmarks_instance_pallet! {
     claim_membership {
         let idty: T::IdtyId = 3.into();
         Membership::<T, I>::take(idty);
-        PendingMembership::<T, I>::insert(idty.clone(), T::MetaData::default());
+        PendingMembership::<T, I>::insert(idty.clone(), ());
         let caller: T::AccountId = T::AccountIdOf::convert(idty.clone()).unwrap();
         let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
         T::BenchmarkSetupHandler::force_status_ok(&idty, &caller);

pallets/membership/src/lib.rs

@@ -356,7 +356,7 @@ pub mod pallet {
 
         /// perform membership claim
         fn do_claim_membership(idty_id: T::IdtyId) {
-            if let Some(_) = PendingMembership::<T, I>::take(idty_id) {
+            if PendingMembership::<T, I>::take(idty_id).is_some() {
                 Self::insert_membership_and_schedule_expiry(idty_id);
                 Self::deposit_event(Event::MembershipAcquired(idty_id));
                 T::OnEvent::on_event(&sp_membership::Event::MembershipAcquired(idty_id));