PoS: refactor usages of Epoch::checked_sub

anoma · Sep 28, 2023 · 95ef243 · 95ef243
1 parent ad9c2d1
commit 95ef243
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 33 deletions.
diff --git a/proof_of_stake/src/epoched.rs b/proof_of_stake/src/epoched.rs
@@ -183,11 +183,10 @@ where
             (last_update, oldest_epoch)
         {
             let oldest_to_keep = current_epoch
-                .0
                 .checked_sub(PastEpochs::value(params))
                 .unwrap_or_default();
-            if oldest_epoch.0 < oldest_to_keep {
-                let diff = oldest_to_keep - oldest_epoch.0;
+            if oldest_epoch < oldest_to_keep {
+                let diff = u64::from(oldest_to_keep - oldest_epoch);
                 // Go through the epochs before the expected oldest epoch and
                 // keep the latest one
                 tracing::debug!(
@@ -266,12 +265,9 @@ where
     }
 
     fn sub_past_epochs(params: &PosParams, epoch: Epoch) -> Epoch {
-        Epoch(
-            epoch
-                .0
-                .checked_sub(PastEpochs::value(params))
-                .unwrap_or_default(),
-        )
+        epoch
+            .checked_sub(PastEpochs::value(params))
+            .unwrap_or_default()
     }
 
     fn get_oldest_epoch_storage_key(&self) -> storage::Key {
@@ -400,12 +396,9 @@ where
     }
 
     fn sub_past_epochs(params: &PosParams, epoch: Epoch) -> Epoch {
-        Epoch(
-            epoch
-                .0
-                .checked_sub(PastEpochs::value(params))
-                .unwrap_or_default(),
-        )
+        epoch
+            .checked_sub(PastEpochs::value(params))
+            .unwrap_or_default()
     }
 
     /// Update data by removing old epochs
@@ -426,11 +419,10 @@ where
             (last_update, oldest_epoch)
         {
             let oldest_to_keep = current_epoch
-                .0
                 .checked_sub(PastEpochs::value(params))
                 .unwrap_or_default();
-            if oldest_epoch.0 < oldest_to_keep {
-                let diff = oldest_to_keep - oldest_epoch.0;
+            if oldest_epoch < oldest_to_keep {
+                let diff = u64::from(oldest_to_keep - oldest_epoch);
                 // Go through the epochs before the expected oldest epoch and
                 // keep the latest one
                 tracing::debug!(
@@ -610,11 +602,10 @@ where
             (last_update, oldest_epoch)
         {
             let oldest_to_keep = current_epoch
-                .0
                 .checked_sub(PastEpochs::value(params))
                 .unwrap_or_default();
-            if oldest_epoch.0 < oldest_to_keep {
-                let diff = oldest_to_keep - oldest_epoch.0;
+            if oldest_epoch < oldest_to_keep {
+                let diff = u64::from(oldest_to_keep - oldest_epoch);
                 // Go through the epochs before the expected oldest epoch and
                 // sum them into it
                 tracing::debug!(
@@ -713,12 +704,9 @@ where
     }
 
     fn sub_past_epochs(params: &PosParams, epoch: Epoch) -> Epoch {
-        Epoch(
-            epoch
-                .0
-                .checked_sub(PastEpochs::value(params))
-                .unwrap_or_default(),
-        )
+        epoch
+            .checked_sub(PastEpochs::value(params))
+            .unwrap_or_default()
     }
 
     fn get_oldest_epoch_storage_key(&self) -> storage::Key {

diff --git a/proof_of_stake/src/lib.rs b/proof_of_stake/src/lib.rs
@@ -3215,10 +3215,10 @@ fn make_unbond_details(
         if slash.epoch >= start
             && slash.epoch
                 < withdraw
-                    .checked_sub(Epoch(
+                    .checked_sub(
                         params.unbonding_len
                             + params.cubic_slashing_window_length,
-                    ))
+                    )
                     .unwrap_or_default()
         {
             let cur_rate = slash_rates_by_epoch.entry(slash.epoch).or_default();
@@ -3751,10 +3751,10 @@ where
                         start,
                         Some(
                             infraction_epoch
-                                .checked_sub(Epoch(
+                                .checked_sub(
                                     params.unbonding_len
                                         + params.cubic_slashing_window_length,
-                                ))
+                                )
                                 .unwrap_or_default(),
                         ),
                         &validator,
@@ -3813,10 +3813,10 @@ where
                         start,
                         Some(
                             infraction_epoch
-                                .checked_sub(Epoch(
+                                .checked_sub(
                                     params.unbonding_len
                                         + params.cubic_slashing_window_length,
-                                ))
+                                )
                                 .unwrap_or_default(),
                         ),
                         &validator,