Cleanup find_map

iotaledger · Dec 4, 2023 · dab0ff9 · dab0ff9
1 parent 4533324
commit dab0ff9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 28 deletions.
diff --git a/sdk/src/client/secret/mod.rs b/sdk/src/client/secret/mod.rs
@@ -557,13 +557,7 @@ where
         .transaction
         .context_inputs()
         .iter()
-        .find_map(|c| {
-            if c.is_commitment() {
-                Some(c.as_commitment().slot_index())
-            } else {
-                None
-            }
-        })
+        .find_map(|c| c.as_commitment_opt().map(|c| c.slot_index()))
         .unwrap_or_else(|| prepared_transaction_data.transaction.creation_slot());
 
     // Assuming inputs_data is ordered by address type

diff --git a/sdk/src/types/block/output/basic.rs b/sdk/src/types/block/output/basic.rs
@@ -320,13 +320,11 @@ impl BasicOutput {
         unlock: &Unlock,
         context: &mut SemanticValidationContext<'_>,
     ) -> Result<(), TransactionFailureReason> {
-        let slot_index = context.transaction.context_inputs().iter().find_map(|c| {
-            if c.is_commitment() {
-                Some(c.as_commitment().slot_index())
-            } else {
-                None
-            }
-        });
+        let slot_index = context
+            .transaction
+            .context_inputs()
+            .iter()
+            .find_map(|c| c.as_commitment_opt().map(|c| c.slot_index()));
 
         if slot_index.is_none()
             && (self.unlock_conditions().timelock().is_some() || self.unlock_conditions().expiration().is_some())

diff --git a/sdk/src/types/block/output/nft.rs b/sdk/src/types/block/output/nft.rs
@@ -415,13 +415,11 @@ impl NftOutput {
         unlock: &Unlock,
         context: &mut SemanticValidationContext<'_>,
     ) -> Result<(), TransactionFailureReason> {
-        let slot_index = context.transaction.context_inputs().iter().find_map(|c| {
-            if c.is_commitment() {
-                Some(c.as_commitment().slot_index())
-            } else {
-                None
-            }
-        });
+        let slot_index = context
+            .transaction
+            .context_inputs()
+            .iter()
+            .find_map(|c| c.as_commitment_opt().map(|c| c.slot_index()));
 
         if slot_index.is_none()
             && (self.unlock_conditions().timelock().is_some() || self.unlock_conditions().expiration().is_some())

diff --git a/sdk/src/types/block/semantic.rs b/sdk/src/types/block/semantic.rs
@@ -283,13 +283,11 @@ impl<'a> SemanticValidationContext<'a> {
                 Output::Delegation(output) => (output.amount(), 0, None, output.unlock_conditions()),
             };
 
-            let commitment_slot_index = self.transaction.context_inputs().iter().find_map(|c| {
-                if c.is_commitment() {
-                    Some(c.as_commitment().slot_index())
-                } else {
-                    None
-                }
-            });
+            let commitment_slot_index = self
+                .transaction
+                .context_inputs()
+                .iter()
+                .find_map(|c| c.as_commitment_opt().map(|c| c.slot_index()));
 
             if let Some(timelock) = unlock_conditions.timelock() {
                 if let Some(commitment_slot_index) = commitment_slot_index {