merge fixes

tari-project · Jan 19, 2024 · 130422d · 130422d
1 parent 424c1c6
commit 130422d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/dan_layer/transaction/src/transaction.rs b/dan_layer/transaction/src/transaction.rs
@@ -178,7 +178,7 @@ impl Transaction {
     }
 
     /// Returns all substates addresses referenced by this transaction
-    pub fn to_referenced_substates(&self) -> Result<HashSet<SubstateAddress>, IndexedValueError> {
+    pub fn to_referenced_substates(&self) -> Result<HashSet<SubstateId>, IndexedValueError> {
         let all_instructions = self.instructions().iter().chain(self.fee_instructions());
 
         let mut substates = HashSet::new();
@@ -195,14 +195,14 @@ impl Transaction {
                     args,
                     ..
                 } => {
-                    substates.insert(SubstateAddress::Component(*component_address));
+                    substates.insert(SubstateId::Component(*component_address));
                     for arg in args.iter().filter_map(|a| a.as_literal_bytes()) {
                         let value = IndexedValue::from_raw(arg)?;
                         substates.extend(value.referenced_substates());
                     }
                 },
                 Instruction::ClaimBurn { claim } => {
-                    substates.insert(SubstateAddress::UnclaimedConfidentialOutput(claim.output_address));
+                    substates.insert(SubstateId::UnclaimedConfidentialOutput(claim.output_address));
                 },
                 _ => {},
             }

diff --git a/utilities/tariswap_test_bench/src/tariswap.rs b/utilities/tariswap_test_bench/src/tariswap.rs
@@ -2,7 +2,7 @@
 //   SPDX-License-Identifier: BSD-3-Clause
 
 use log::info;
-use tari_dan_common_types::ShardId;
+use tari_dan_common_types::SubstateAddress;
 use tari_dan_wallet_sdk::{apis::key_manager::TRANSACTION_BRANCH, models::Account};
 use tari_template_lib::{
     args,
@@ -68,8 +68,8 @@ impl Runner {
                 let transaction = Transaction::builder()
                     .with_input_refs(vec![
                         // Use resources as input refs to allow concurrent access.
-                        ShardId::from_address(&faucet.resource_address.into(), 0),
-                        ShardId::from_address(&XTR2.into(), 0),
+                        SubstateAddress::from_address(&faucet.resource_address.into(), 0),
+                        SubstateAddress::from_address(&XTR2.into(), 0),
                     ])
                     .fee_transaction_pay_from_component(account.address.as_component_address().unwrap(), Amount(1000))
                     .call_method(account.address.as_component_address().unwrap(), "withdraw", args![
@@ -123,8 +123,8 @@ impl Runner {
                 let transaction = Transaction::builder()
                     // Use resources as input refs to allow concurrent access.
                     .with_input_refs(vec![
-                        ShardId::from_address(&faucet.resource_address.into(), 0),
-                        ShardId::from_address(&XTR2.into(), 0),
+                        SubstateAddress::from_address(&faucet.resource_address.into(), 0),
+                        SubstateAddress::from_address(&XTR2.into(), 0),
                     ])
                     .fee_transaction_pay_from_component(account.address.as_component_address().unwrap(), Amount(1000))
                     .call_method(tariswap.component_address, "get_pool_balance", args![ XTR2, ])
@@ -171,8 +171,8 @@ impl Runner {
                 let transaction = Transaction::builder()
                     // Use resources as input refs to allow concurrent access.
                     .with_input_refs(vec![
-                        ShardId::from_address(&faucet.resource_address.into(), 0),
-                        ShardId::from_address(&XTR2.into(), 0),
+                        SubstateAddress::from_address(&faucet.resource_address.into(), 0),
+                        SubstateAddress::from_address(&XTR2.into(), 0),
                     ])
                     .fee_transaction_pay_from_component(account.address.as_component_address().unwrap(), Amount(1000))
                     .call_method(tariswap.component_address, "get_pool_balance", args![XTR2])