simplify flush checks

OffchainLabs · Sep 5, 2023 · 3b095ac · 3b095ac
1 parent 58e0668
commit 3b095ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/stylus-sdk/src/call/raw.rs b/stylus-sdk/src/call/raw.rs
@@ -34,7 +34,7 @@ enum CallKind {
 
 /// How to manage the storage cache, if enabled.
 #[allow(unused)]
-#[derive(Clone, Default, PartialEq, PartialOrd)]
+#[derive(Clone, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) enum CachePolicy {
     #[default]
     DoNothing,
@@ -128,9 +128,7 @@ impl RawCall {
     /// Write all cached values to persistent storage before the call.
     #[cfg(feature = "storage-cache")]
     pub fn flush_storage_cache(mut self) -> Self {
-        if self.cache_policy < CachePolicy::Flush {
-            self.cache_policy = CachePolicy::Flush;
-        }
+        self.cache_policy = self.cache_policy.max(CachePolicy::Flush);
         self
     }
 

diff --git a/stylus-sdk/src/deploy/raw.rs b/stylus-sdk/src/deploy/raw.rs
@@ -63,9 +63,7 @@ impl RawDeploy {
     /// Write all cached values to persistent storage before the init code.
     #[cfg(feature = "storage-cache")]
     pub fn flush_storage_cache(mut self) -> Self {
-        if self.cache_policy < CachePolicy::Flush {
-            self.cache_policy = CachePolicy::Flush;
-        }
+        self.cache_policy = self.cache_policy.max(CachePolicy::Flush);
         self
     }