fmt

Author: ipapandinas

pallets/inflation/src/lib.rs

@@ -552,9 +552,10 @@ pub mod pallet {
             let adjustment_factor = staked_ratio / config.ideal_staking_rate;
 
             let adjustable_part = adjustment_factor * config.adjustable_staker_reward_pool_per_era;
-            let staker_reward_pool = config.decay_factor * config
-                .base_staker_reward_pool_per_era
-                .saturating_add(adjustable_part);
+            let staker_reward_pool = config.decay_factor
+                * config
+                    .base_staker_reward_pool_per_era
+                    .saturating_add(adjustable_part);
             let dapp_reward_pool = config.decay_factor * config.dapp_reward_pool_per_era;
 
             (staker_reward_pool, dapp_reward_pool)

pallets/inflation/src/migration.rs

@@ -48,10 +48,12 @@ mod v2 {
         InflationParameters as InflationParametersV1,
     };
 
-    pub struct VersionMigrateV1ToV2<T, DecayRate, DecayFactor>(PhantomData<(T, DecayRate, DecayFactor)>);
+    pub struct VersionMigrateV1ToV2<T, DecayRate, DecayFactor>(
+        PhantomData<(T, DecayRate, DecayFactor)>,
+    );
 
-    impl<T: Config, DecayRate: Get<Perquintill>, DecayFactor: Get<Perquintill>> UncheckedOnRuntimeUpgrade
-        for VersionMigrateV1ToV2<T, DecayRate, DecayFactor>
+    impl<T: Config, DecayRate: Get<Perquintill>, DecayFactor: Get<Perquintill>>
+        UncheckedOnRuntimeUpgrade for VersionMigrateV1ToV2<T, DecayRate, DecayFactor>
     {
         fn on_runtime_upgrade() -> Weight {
             let decay_rate = DecayRate::get();
@@ -96,7 +98,7 @@ mod v2 {
                         bonus_reward_pool_per_period: old_config.bonus_reward_pool_per_period,
                         ideal_staking_rate: old_config.ideal_staking_rate,
                         decay_rate,
-                        decay_factor
+                        decay_factor,
                     }),
                     _ => None,
                 },

pallets/inflation/src/tests.rs

@@ -288,7 +288,11 @@ fn inflation_recalculation_works() {
             new_config.recalculation_era,
             now + <Test as Config>::CycleConfiguration::eras_per_cycle()
         );
-        assert_eq!(new_config.decay_factor, Perquintill::one(), "Default decay factor expected.");
+        assert_eq!(
+            new_config.decay_factor,
+            Perquintill::one(),
+            "Default decay factor expected."
+        );
 
         // Verify collator rewards are as expected
         assert!(
@@ -550,7 +554,10 @@ fn on_initialize_decay_and_payout_works() {
 fn set_decay_factor_works() {
     ExternalityBuilder::build().execute_with(|| {
         // Sanity Check
-        assert_eq!(ActiveInflationConfig::<Test>::get().decay_factor, Perquintill::one());
+        assert_eq!(
+            ActiveInflationConfig::<Test>::get().decay_factor,
+            Perquintill::one()
+        );
 
         assert_noop!(
             Inflation::force_set_decay_factor(RuntimeOrigin::signed(1), Perquintill::one()),
@@ -562,8 +569,16 @@ fn set_decay_factor_works() {
             RuntimeOrigin::root(),
             new_decay_factor
         ));
-        System::assert_last_event(Event::DecayFactorUpdated { decay_factor: new_decay_factor }.into());
-        assert_eq!(ActiveInflationConfig::<Test>::get().decay_factor, new_decay_factor);
+        System::assert_last_event(
+            Event::DecayFactorUpdated {
+                decay_factor: new_decay_factor,
+            }
+            .into(),
+        );
+        assert_eq!(
+            ActiveInflationConfig::<Test>::get().decay_factor,
+            new_decay_factor
+        );
     })
 }
 
@@ -595,26 +610,23 @@ fn force_readjust_config_with_decay_works() {
         let new_max_emission_from_config = new_config.collator_reward_per_block
             * Balance::from(<Test as Config>::CycleConfiguration::blocks_per_cycle())
             + new_config.treasury_reward_per_block
-            * Balance::from(<Test as Config>::CycleConfiguration::blocks_per_cycle())
+                * Balance::from(<Test as Config>::CycleConfiguration::blocks_per_cycle())
             + new_config.dapp_reward_pool_per_era
-            * Balance::from(
-            <Test as Config>::CycleConfiguration::build_and_earn_eras_per_cycle(),
-        )
+                * Balance::from(
+                    <Test as Config>::CycleConfiguration::build_and_earn_eras_per_cycle(),
+                )
             + new_config.base_staker_reward_pool_per_era
-            * Balance::from(
-            <Test as Config>::CycleConfiguration::build_and_earn_eras_per_cycle(),
-        )
+                * Balance::from(
+                    <Test as Config>::CycleConfiguration::build_and_earn_eras_per_cycle(),
+                )
             + new_config.adjustable_staker_reward_pool_per_era
-            * Balance::from(
-            <Test as Config>::CycleConfiguration::build_and_earn_eras_per_cycle(),
-        )
+                * Balance::from(
+                    <Test as Config>::CycleConfiguration::build_and_earn_eras_per_cycle(),
+                )
             + new_config.bonus_reward_pool_per_period
-            * Balance::from(<Test as Config>::CycleConfiguration::periods_per_cycle());
+                * Balance::from(<Test as Config>::CycleConfiguration::periods_per_cycle());
 
-        lenient_balance_assert_eq!(
-            original_max_emission,
-            new_max_emission_from_config
-        );
+        lenient_balance_assert_eq!(original_max_emission, new_max_emission_from_config);
     })
 }
 
@@ -665,8 +677,14 @@ fn force_update_decay_rate_and_reset_factor_works() {
 
         // Check updates
         let cfg_after = ActiveInflationConfig::<Test>::get();
-        assert_eq!(cfg_after.decay_rate, new_decay_rate, "Decay rate should be reset to default");
-        assert_eq!(cfg_after.decay_factor, new_decay_factor, "Decay factor should be updated");
+        assert_eq!(
+            cfg_after.decay_rate, new_decay_rate,
+            "Decay rate should be reset to default"
+        );
+        assert_eq!(
+            cfg_after.decay_factor, new_decay_factor,
+            "Decay factor should be updated"
+        );
 
         let issuance_before = Balances::total_issuance();
         Inflation::on_initialize(1);
@@ -675,4 +693,3 @@ fn force_update_decay_rate_and_reset_factor_works() {
         lenient_balance_assert_eq!(issuance_now, issuance_before + total_expected_payout);
     });
 }
-