Tweaks

docknetwork · Jan 22, 2024 · dfe8cab · dfe8cab
1 parent dd139b9
commit dfe8cab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/pallets/staking-rewards/src/lib.rs b/pallets/staking-rewards/src/lib.rs
@@ -86,7 +86,7 @@ pub mod pallet {
 
     #[pallet::call]
     impl<T: Config> Pallet<T> {
-        /// Enable/disable emission rewards by calling this function with true or false respectively.
+        /// Enable/disable emission rewards by calling this function true or false respectively.
         #[pallet::weight(T::DbWeight::get().writes(1))]
         pub fn set_emission_status(
             origin: OriginFor<T>,

diff --git a/pallets/staking-rewards/src/tests.rs b/pallets/staking-rewards/src/tests.rs
@@ -44,10 +44,10 @@ parameter_types! {
     pub const SS58Prefix: u8 = 21;
     pub const TreasuryRewardsPct: Percent = Percent::from_percent(60);
     pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
-    pub PostUpgradeHighRateDuration: Option<DurationInEras> = None;
+    pub PostUpgradeHighRateDuration: Option<DurationInEras> = Some(DurationInEras::new_non_zero(10));
 }
 
-// For testing, setting `LowRateRewardDecayPct` this way so it can be changed during tests
+// For testing, set `LowRateRewardDecayPct` this way so it can be changed during tests
 thread_local! {
     static LOW_RATE_REWARD_DECAY_PCT: RefCell<Percent> = RefCell::new(Percent::from_percent(10));
     static HIGH_RATE_REWARD_DECAY_PCT: RefCell<Percent> = RefCell::new(Percent::from_percent(20));

diff --git a/pallets/staking-rewards/src/types.rs b/pallets/staking-rewards/src/types.rs
@@ -123,15 +123,17 @@ impl HighRateRewardsState {
     /// HighRateRewardsState::None.inc_duration_or_init(TWO_ERAS), /* => */ HighRateRewardsState::StartingInNextEra { duration: TWO_ERAS }
     /// # );
     /// ```
-    pub fn inc_duration_or_init(&mut self, inc_duration: DurationInEras) -> Self {
+    pub fn inc_duration_or_init(
+        &mut self,
+        inc_duration @ DurationInEras(increment): DurationInEras,
+    ) -> Self {
         match self {
             HighRateRewardsState::StartingInNextEra {
                 duration: DurationInEras(duration),
             }
             | HighRateRewardsState::Active {
                 ends_after: DurationInEras(duration),
             } => {
-                let DurationInEras(increment) = inc_duration;
                 *duration = duration.saturating_add(increment.get());
             }
             HighRateRewardsState::None => {