Some weights, and benchmarks modification

AstarNetwork · May 1, 2024 · 53a9b1a · 53a9b1a
1 parent 201083d
commit 53a9b1a
Show file tree

Hide file tree

Showing 5 changed files with 541 additions and 508 deletions.
diff --git a/pallets/dapp-staking-v3/src/benchmarking/mod.rs b/pallets/dapp-staking-v3/src/benchmarking/mod.rs
@@ -990,6 +990,9 @@ mod benchmarks {
         prepare_contracts_for_tier_assignment::<T>(x);
         force_advance_to_next_era::<T>();
 
+        // Need to ensure settings remain unchanged even after the era change
+        init_tier_settings::<T>();
+
         let reward_era = ActiveProtocolState::<T>::get().era;
         let reward_period = ActiveProtocolState::<T>::get().period_number();
         let reward_pool = Balance::from(10_000 * UNIT as u128);

diff --git a/pallets/dapp-staking-v3/src/benchmarking/utils.rs b/pallets/dapp-staking-v3/src/benchmarking/utils.rs
@@ -154,7 +154,13 @@ pub(super) fn initial_config<T: Config>() {
         maintenance: false,
     });
 
-    // Init tier params
+    init_tier_settings::<T>();
+
+    Safeguard::<T>::put(false);
+}
+
+/// Set initial tier param & config
+pub(super) fn init_tier_settings<T: Config>() {
     let tier_params = TierParameters::<T::NumberOfTiers> {
         reward_portion: BoundedVec::try_from(vec![
             Permill::from_percent(40),
@@ -204,8 +210,6 @@ pub(super) fn initial_config<T: Config>() {
 
     StaticTierParams::<T>::put(tier_params);
     TierConfig::<T>::put(init_tier_config.clone());
-
-    Safeguard::<T>::put(false);
 }
 
 /// Maximum number of contracts that 'makes sense' - considers both contract number limit & number of slots.

diff --git a/pallets/dapp-staking-v3/src/test/tests.rs b/pallets/dapp-staking-v3/src/test/tests.rs
@@ -2386,7 +2386,7 @@ fn tier_config_recalculation_works() {
 #[test]
 fn get_dapp_tier_assignment_and_rewards_basic_example_works() {
     ExtBuilder::build().execute_with(|| {
-        // Tier config is specially adapter for this test.
+        // Tier config is specially adapted for this test.
         TierConfig::<Test>::mutate(|config| {
             config.number_of_slots = 40;
             config.slots_per_tier = BoundedVec::try_from(vec![2, 5, 13, 20]).unwrap();