chore: linter and revert change

tari-project · Sep 4, 2024 · 6863eb7 · 6863eb7
1 parent 8dbaee2
commit 6863eb7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/dan_layer/engine_types/src/substate.rs b/dan_layer/engine_types/src/substate.rs
@@ -30,8 +30,13 @@ use tari_bor::{decode, decode_exact, encode, BorError};
 use tari_common_types::types::FixedHash;
 use tari_template_lib::{
     models::{
-        ComponentAddress, NonFungibleAddress, NonFungibleIndexAddress, ObjectKey, ResourceAddress,
-        UnclaimedConfidentialOutputAddress, VaultId,
+        ComponentAddress,
+        NonFungibleAddress,
+        NonFungibleIndexAddress,
+        ObjectKey,
+        ResourceAddress,
+        UnclaimedConfidentialOutputAddress,
+        VaultId,
     },
     prelude::PUBLIC_IDENTITY_RESOURCE_ADDRESS,
     Hash,
@@ -147,14 +152,14 @@ impl SubstateId {
     /// Returns true for any substate that has is "versionable" i.e. can have a version > 0, otherwise false.
     pub fn is_versioned(&self) -> bool {
         match self {
-            SubstateId::Component(_)
-            | SubstateId::Resource(_)
-            | SubstateId::Vault(_)
-            | SubstateId::NonFungibleIndex(_)
-            | SubstateId::NonFungible(_) => true,
-            SubstateId::UnclaimedConfidentialOutput(_)
-            | SubstateId::TransactionReceipt(_)
-            | SubstateId::FeeClaim(_) => false,
+            SubstateId::Component(_) |
+            SubstateId::Resource(_) |
+            SubstateId::Vault(_) |
+            SubstateId::NonFungibleIndex(_) |
+            SubstateId::NonFungible(_) => true,
+            SubstateId::UnclaimedConfidentialOutput(_) |
+            SubstateId::TransactionReceipt(_) |
+            SubstateId::FeeClaim(_) => false,
         }
     }
 

diff --git a/dan_layer/transaction_manifest/src/value.rs b/dan_layer/transaction_manifest/src/value.rs
@@ -49,6 +49,10 @@ impl FromStr for ManifestValue {
         SubstateId::from_str(s)
             .ok()
             .map(ManifestValue::SubstateId)
+            .or_else(|| {
+                let id = NonFungibleId::try_from_canonical_string(s).ok()?;
+                Some(ManifestValue::NonFungibleId(id))
+            })
             .or_else(|| {
                 let tokens = s.parse().ok()?;
                 let lit = parse2(tokens).ok()?;