Review suggestions

iotaledger · Dec 6, 2023 · c7a9a62 · c7a9a62
1 parent b73f82f
commit c7a9a62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/sdk/src/types/block/output/unlock_condition/expiration.rs b/sdk/src/types/block/output/unlock_condition/expiration.rs
@@ -82,13 +82,11 @@ impl ExpirationUnlockCondition {
     ) -> Option<&'a Address> {
         let slot_index = slot_index.into();
 
-        if self.slot_index() > (slot_index + committable_age_range.max) {
-            Some(address)
-        } else if self.slot_index() <= (slot_index + committable_age_range.min) {
-            Some(&self.return_address)
-        } else {
-            None
-        }
+        self.is_expired(slot_index, committable_age_range).map(
+            |expired| {
+                if expired { &self.return_address } else { address }
+            },
+        )
     }
 }
 

diff --git a/sdk/src/wallet/operations/helpers/time.rs b/sdk/src/wallet/operations/helpers/time.rs
@@ -24,7 +24,7 @@ pub(crate) fn can_output_be_unlocked_now(
         .required_address(slot_index.into(), committable_age_range)?;
 
     // In case of `None` the output can currently not be unlocked because of expiration unlock condition
-    required_address.map_or_else(|| Ok(false), |required_address| Ok(wallet_address == &required_address))
+    Ok(required_address.map_or_else(|| false, |required_address| wallet_address == &required_address))
 }
 
 // Check if an output can be unlocked by the wallet address at the current time and at any