Resolve conflicts

iotaledger · Jan 12, 2024 · 2b1d7b0 · 2b1d7b0
1 parent e9ee9e6
commit 2b1d7b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/sdk/src/client/secret/mod.rs b/sdk/src/client/secret/mod.rs
@@ -50,7 +50,7 @@ use crate::{
     client::{
         api::{
             input_selection::Error as InputSelectionError, transaction::validate_signed_transaction_payload_length,
-            PreparedTransactionData,
+            verify_semantic, PreparedTransactionData,
         },
         Error,
     },

diff --git a/sdk/src/types/block/output/delegation.rs b/sdk/src/types/block/output/delegation.rs
@@ -18,7 +18,7 @@ use crate::types::block::{
     },
     protocol::{ProtocolParameters, WorkScore, WorkScoreParameters},
     semantic::StateTransitionError,
-    slot::EpochIndex,
+    slot::{EpochIndex, SlotIndex},
     Error,
 };
 
@@ -38,11 +38,7 @@ impl From<&OutputId> for DelegationId {
 
 impl DelegationId {
     pub fn or_from_output_id(self, output_id: &OutputId) -> Self {
-        if self.is_null() {
-            Self::from(output_id)
-        } else {
-            self
-        }
+        if self.is_null() { Self::from(output_id) } else { self }
     }
 }
 
@@ -348,7 +344,7 @@ impl DelegationOutput {
         let slot_commitment_id = context_inputs
             .iter()
             .find(|i| i.kind() == CommitmentContextInput::KIND)
-            .map(|s| s.as_commitment().commitment_id())
+            .map(|s| s.as_commitment().slot_commitment_id())
             .ok_or(StateTransitionError::MissingCommitmentContextInput)?;
 
         let future_bounded_slot: SlotIndex = slot_commitment_id.slot_index() + protocol_parameters.min_committable_age;