From d8c9ac45f2921db0ce4d69d7c96a08c69a015143 Mon Sep 17 00:00:00 2001 From: Alex Coats Date: Thu, 15 Feb 2024 14:23:39 -0500 Subject: [PATCH] remove automatically_transitioned --- .../api/block_builder/input_selection/mod.rs | 2 -- .../input_selection/requirement/amount.rs | 14 +------------- .../block_builder/input_selection/transition.rs | 10 ++-------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/sdk/src/client/api/block_builder/input_selection/mod.rs b/sdk/src/client/api/block_builder/input_selection/mod.rs index 9158df1a5a..4b4f00ba4e 100644 --- a/sdk/src/client/api/block_builder/input_selection/mod.rs +++ b/sdk/src/client/api/block_builder/input_selection/mod.rs @@ -56,7 +56,6 @@ pub struct InputSelection { creation_slot: SlotIndex, latest_slot_commitment_id: SlotCommitmentId, requirements: Vec, - automatically_transitioned: HashSet, min_mana_allotment: Option, mana_allotments: BTreeMap, mana_rewards: HashMap, @@ -128,7 +127,6 @@ impl InputSelection { creation_slot: creation_slot_index.into(), latest_slot_commitment_id, requirements: Vec::new(), - automatically_transitioned: HashSet::new(), min_mana_allotment: None, mana_allotments: Default::default(), mana_rewards: Default::default(), diff --git a/sdk/src/client/api/block_builder/input_selection/requirement/amount.rs b/sdk/src/client/api/block_builder/input_selection/requirement/amount.rs index 9abfccef32..9a45039fb6 100644 --- a/sdk/src/client/api/block_builder/input_selection/requirement/amount.rs +++ b/sdk/src/client/api/block_builder/input_selection/requirement/amount.rs @@ -247,19 +247,7 @@ impl InputSelection { fn reduce_funds_of_chains(&mut self, amount_selection: &mut AmountSelection) -> Result<(), Error> { // Only consider automatically transitioned outputs. - let outputs = self - .provided_outputs - .iter_mut() - .chain(&mut self.added_outputs) - .filter(|output| { - output - .chain_id() - .as_ref() - .map(|chain_id| self.automatically_transitioned.contains(chain_id)) - .unwrap_or(false) - }); - - for output in outputs { + for output in self.added_outputs.iter_mut() { let diff = amount_selection.missing_amount(); let amount = output.amount(); let minimum_amount = output.minimum_amount(self.protocol_parameters.storage_score_parameters()); diff --git a/sdk/src/client/api/block_builder/input_selection/transition.rs b/sdk/src/client/api/block_builder/input_selection/transition.rs index 792b636d26..39089dcb48 100644 --- a/sdk/src/client/api/block_builder/input_selection/transition.rs +++ b/sdk/src/client/api/block_builder/input_selection/transition.rs @@ -8,8 +8,8 @@ use super::{ use crate::{ client::secret::types::InputSigningData, types::block::output::{ - AccountOutput, AccountOutputBuilder, ChainId, FoundryOutput, FoundryOutputBuilder, NftOutput, NftOutputBuilder, - Output, OutputId, + AccountOutput, AccountOutputBuilder, FoundryOutput, FoundryOutputBuilder, NftOutput, NftOutputBuilder, Output, + OutputId, }, }; @@ -69,8 +69,6 @@ impl InputSelection { let output = builder.finish_output()?; - self.automatically_transitioned.insert(ChainId::from(account_id)); - log::debug!("Automatic transition of {output_id:?}/{account_id:?}"); Ok(Some(output)) @@ -108,8 +106,6 @@ impl InputSelection { .with_features(features) .finish_output()?; - self.automatically_transitioned.insert(ChainId::from(nft_id)); - log::debug!("Automatic transition of {output_id:?}/{nft_id:?}"); Ok(Some(output)) @@ -145,8 +141,6 @@ impl InputSelection { let output = FoundryOutputBuilder::from(input).finish_output()?; - self.automatically_transitioned.insert(ChainId::from(foundry_id)); - log::debug!("Automatic transition of {output_id:?}/{foundry_id:?}"); Ok(Some(output))