Applied Christian awesomeness

iotaledger · May 6, 2022 · 2633d73 · 2633d73
1 parent c41cd41
commit 2633d73
Showing 1 changed file with 20 additions and 29 deletions.
diff --git a/bee-ledger/src/workers/pruning/condition.rs b/bee-ledger/src/workers/pruning/condition.rs
@@ -63,39 +63,30 @@ pub(crate) fn should_prune<S: StorageBackend>(
         if now < prev + pruning_config.db_size().cooldown_time() {
             Err(PruningSkipReason::Cooldown)
         } else {
-            let actual_size = {
-                if let Ok(size) = storage.size() {
-                    size.ok_or(PruningSkipReason::SizeMetricUnavailable)
-                } else {
-                    Err(PruningSkipReason::SizeMetricUnsupported)
-                }
-            };
-
-            match actual_size {
-                Ok(actual_size) => {
+            storage
+                .size()
+                .map_err(|_| PruningSkipReason::SizeMetricUnsupported)
+                .and_then(|a| {
+                    let actual_size = a.ok_or(PruningSkipReason::SizeMetricUnavailable)?;
                     let threshold_size = pruning_config.db_size().target_size();
 
                     log::debug!("Storage size: actual {actual_size} threshold {threshold_size}");
 
-                    if actual_size < threshold_size {
-                        Err(PruningSkipReason::BelowTargetSizeThreshold)
-                    } else {
-                        // Panic: cannot underflow due to actual_size >= threshold_size.
-                        let excess_size = actual_size - threshold_size;
-                        let num_bytes_to_prune = excess_size
-                            + (pruning_config.db_size().threshold_percentage() as f64 / 100.0 * threshold_size as f64)
-                                as usize;
-
-                        log::debug!("Num bytes to prune: {num_bytes_to_prune}");
-
-                        // Store the time we issued a pruning-by-size.
-                        PREVIOUS_PRUNING_BY_SIZE.store(now.as_secs(), Ordering::Relaxed);
-
-                        Ok(PruningTask::ByDbSize { num_bytes_to_prune })
-                    }
-                }
-                Err(reason) => Err(reason),
-            }
+                    let excess_size = actual_size
+                        .checked_sub(threshold_size)
+                        .ok_or(PruningSkipReason::BelowTargetSizeThreshold)?;
+
+                    let num_bytes_to_prune = excess_size
+                        + (pruning_config.db_size().threshold_percentage() as f64 / 100.0 * threshold_size as f64)
+                            as usize;
+
+                    log::debug!("Num bytes to prune: {num_bytes_to_prune}");
+
+                    // Store the time we issued a pruning-by-size.
+                    PREVIOUS_PRUNING_BY_SIZE.store(now.as_secs(), Ordering::Relaxed);
+
+                    Ok(PruningTask::ByDbSize { num_bytes_to_prune })
+                })
         }
     } else {
         Err(PruningSkipReason::Disabled)