take disabled from the next session and rustfmt pallet code

Signed-off-by: Uncle Stinky <uncle.stinky@ghostchain.io>

pallets/slow-clap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ghost-slow-clap"
-version = "0.3.47"
+version = "0.3.50"
 description = "Applause protocol for the EVM bridge"
 license.workspace = true
 authors.workspace = true

pallets/slow-clap/src/lib.rs

@@ -9,7 +9,7 @@ use frame_support::{
     pallet_prelude::*,
     traits::{
         tokens::fungible::{Inspect, Mutate},
-        EstimateNextSessionRotation, Get, OneSessionHandler, ValidatorSet,
+        DisabledValidators, EstimateNextSessionRotation, Get, OneSessionHandler, ValidatorSet,
         ValidatorSetWithIdentification,
     },
     WeakBoundedVec,
@@ -199,6 +199,7 @@ pub mod pallet {
             IdentificationTuple<Self>,
             ThrottlingOffence<IdentificationTuple<Self>>,
         >;
+        type DisabledValidators: DisabledValidators;
 
         #[pallet::constant]
         type MaxAuthorities: Get<u32>;
@@ -398,6 +399,14 @@ pub mod pallet {
                     None => return InvalidTransaction::BadSigner.into(),
                 };
 
+                if ClapsInSession::<T>::get(&session_index)
+                    .get(&clap.authority_index)
+                    .map(|info| info.disabled)
+                    .unwrap_or_default()
+                {
+                    return InvalidTransaction::BadSigner.into();
+                }
+
                 let signature_valid =
                     clap.using_encoded(|encoded_clap| authority.verify(&encoded_clap, signature));
 
@@ -506,14 +515,14 @@ impl<T: Config> Pallet<T> {
             Error::<T>::CurrentValidatorIsDisabled
         );
 
-        let disabled_authorites = claps_in_session
+        let disabled_authorities = claps_in_session
             .values()
             .filter(|info| info.disabled)
             .count();
 
         let active_authorities = Authorities::<T>::get(&session_index)
             .len()
-            .saturating_sub(disabled_authorites);
+            .saturating_sub(disabled_authorities);
 
         let received_claps_key = (session_index, &clap.transaction_hash, &clap_unique_hash);
 
@@ -636,12 +645,12 @@ impl<T: Config> Pallet<T> {
             .cloned()
             .collect::<BTreeSet<T::AuthorityId>>();
 
-        let disabled_authorites = ClapsInSession::<T>::get(&prev_session_index)
+        let disabled_authorities = ClapsInSession::<T>::get(&curr_session_index)
             .values()
             .filter(|info| info.disabled)
             .count();
 
-        let active_authorities = prev_authorities.len().saturating_sub(disabled_authorites);
+        let active_authorities = prev_authorities.len().saturating_sub(disabled_authorities);
 
         let summary_authority_claps_length = curr_received_claps
             .symmetric_difference(&prev_received_claps)
@@ -1104,7 +1113,18 @@ impl<T: Config> Pallet<T> {
 
         Validators::<T>::insert(&session_index, bounded_validators);
         Authorities::<T>::set(&session_index, bounded_authorities);
-        ClapsInSession::<T>::set(&session_index, Default::default());
+
+        let mut disabled_validators: BTreeMap<AuthIndex, SessionAuthorityInfo> = Default::default();
+        for disabled_index in T::DisabledValidators::disabled_validators().iter() {
+            let _ = disabled_validators.insert(
+                *disabled_index,
+                SessionAuthorityInfo {
+                    claps: 0u32,
+                    disabled: true,
+                },
+            );
+        }
+        ClapsInSession::<T>::set(&session_index, disabled_validators);
     }
 
     fn clear_history(target_session_index: &SessionIndex) {

pallets/slow-clap/src/mock.rs

@@ -206,6 +206,7 @@ impl Config for Runtime {
     type NetworkDataHandler = Networks;
     type BlockNumberProvider = System;
     type ReportUnresponsiveness = OffenceHandler;
+    type DisabledValidators = Session;
 
     type MaxAuthorities = ConstU32<5>;
     type ApplauseThreshold = ConstU32<50>;

pallets/slow-clap/src/tests.rs

@@ -710,7 +710,7 @@ fn should_throw_error_if_validator_disabled_and_ignore_later() {
         assert_eq!(Session::disable_index(0), true);
         assert_err!(
             do_clap_from(session_index, network_id, 0, false),
-            Error::<Runtime>::CurrentValidatorIsDisabled
+            DispatchError::Other("Invalid signing address")
         );
 
         assert_eq!(pallet::ReceivedClaps::<Runtime>::get(&storage_key).len(), 0);