more cleanup

Author: shannonwells

pallets/msa/src/lib.rs

@@ -1707,11 +1707,11 @@ impl<T: Config> SchemaGrantValidator<BlockNumberFor<T>> for Pallet<T> {
 
 impl<T: Config> MsaKeyProvider for Pallet<T> {
 	type AccountId = T::AccountId;
-	// Returns true if ALL of the following are true: 
-	// - Msa exists 
-	// - Current block is < FreeKeyAddExpirationBlock
+	// Returns true if ALL of the following are true:
+	// - Msa exists
+	// - FreeKeyAddExpirationBlock is after current block
 	// - The stored msa_id for the key == `msa_id`
-	// - It has only one key associated with it 
+	// - It has only one key associated with it
 	fn key_eligible_for_free_addition(old_key: Self::AccountId, msa_id: MessageSourceId) -> bool {
 		if let Some(stored_msa_id) = Self::get_msa_id(&old_key) {
 			let block = frame_system::Pallet::<T>::block_number();
@@ -1869,7 +1869,7 @@ impl<T: Config + Send + Sync> CheckFreeExtrinsicUse<T> {
 		)
 		.any(|provider_id| {
 			Pallet::<T>::ensure_valid_delegation(provider_id, delegator_id, None).is_ok()
-		});type FreeKeyAddExpirationOrigin
+		});
 
 		ensure!(
 			!has_active_delegations,

runtime/frequency/src/lib.rs

@@ -343,11 +343,7 @@ impl GetAddKeyData<RuntimeCall, AccountId, MessageSourceId> for MsaCallFilter {
 	fn get_add_key_data(call: &RuntimeCall) -> Option<(AccountId, MessageSourceId)> {
 		match call {
 			#[cfg(feature = "runtime-benchmarks")]
-			RuntimeCall::System(frame_system::Call::remark { .. }) => {
-				let account_id: AccountId = AccountId::from([2; 32]);
-				let msa_id: MessageSourceId = 2u32.into();
-				Some((account_id, msa_id))
-			},
+			RuntimeCall::System(frame_system::Call::remark { .. }) => None,
 
 			RuntimeCall::Msa(MsaCall::add_public_key_to_msa {
 				add_key_payload,