readjust config in force_set_decay_rate

Author: ipapandinas

pallets/inflation/src/benchmarking.rs

@@ -123,7 +123,8 @@ mod benchmarks {
         #[extrinsic_call]
         _(RawOrigin::Root, new_decay_rate);
 
-        assert_last_event::<T>(Event::<T>::DecayRateUpdated { new_decay_rate }.into());
+        let config = ActiveInflationConfig::<T>::get();
+        assert_last_event::<T>(Event::<T>::DecayRateUpdated { config }.into());
     }
 
     #[benchmark]

pallets/inflation/src/lib.rs

@@ -174,7 +174,7 @@ pub mod pallet {
         /// New inflation configuration has been set.
         NewInflationConfiguration { config: InflationConfiguration },
         /// Inflation decay rate has been updated. This will take effect in the next cycle.
-        DecayRateUpdated { new_decay_rate: Perquintill },
+        DecayRateUpdated { config: InflationConfiguration },
     }
 
     #[pallet::error]
@@ -332,8 +332,6 @@ pub mod pallet {
         /// Used to force-set the per-block decay rate for rewards.
         ///
         /// Must be called by `root` origin.
-        ///
-        /// The new rate will be applied starting from the next inflation recalculation (next cycle).
         #[pallet::call_index(3)]
         #[pallet::weight(T::WeightInfo::force_set_decay_rate())]
         pub fn force_set_decay_rate(
@@ -346,8 +344,11 @@ pub mod pallet {
                 params.decay_rate = decay_rate;
             });
 
+            let config = Self::readjusted_config();
+            ActiveInflationConfig::<T>::put(config.clone());
+
             Self::deposit_event(Event::<T>::DecayRateUpdated {
-                new_decay_rate: decay_rate,
+                config,
             });
 
             Ok(().into())

pallets/inflation/src/tests.rs

@@ -568,7 +568,9 @@ fn set_decay_rate_works() {
             RuntimeOrigin::root(),
             new_decay_rate
         ));
-        System::assert_last_event(Event::DecayRateUpdated { new_decay_rate }.into());
+        let config = ActiveInflationConfig::<Test>::get();
+        System::assert_last_event(Event::DecayRateUpdated { config }.into());
+        assert_eq!(config.decay_rate, new_decay_rate);
         assert_eq!(InflationParams::<Test>::get().decay_rate, new_decay_rate);
     })
 }