fix test scripts

onflow · Sep 30, 2024 · bea9daa · bea9daa
1 parent 4aea638
commit bea9daa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/cadence/scripts/get_examplenft_type.cdc b/cadence/scripts/get_examplenft_type.cdc
@@ -2,12 +2,5 @@ import "NonFungibleToken"
 import "ExampleNFT"
 
 access(all) fun main(): String {
-    let x = ReferenceType(entitlements: ["A.f8d6e0586b0a20c7.NonFungibleToken.Withdraw"], type: CompositeType(Type<@ExampleNFT.Collection>().identifier)!)
-    let y = ReferenceType(entitlements: [], type: CompositeType(Type<@ExampleNFT.Collection>().identifier)!)
-    //let y = CompositeType("A.f8d6e0586b0a20c7.ExampleNFT.Collection")
-    //return y!.identifier
-    //return x!.identifier
-    return Type<&ExampleNFT.NFT>().identifier
-
-
+    return Type<@ExampleNFT.NFT>().identifier
 }
diff --git a/cadence/transactions/add_to_nft_catalog.cdc b/cadence/transactions/add_to_nft_catalog.cdc
@@ -13,8 +13,11 @@ transaction(
     publicPathIdentifier: String
 ) {
     let adminProxyRef : auth(NFTCatalogAdmin.CatalogActions) &NFTCatalogAdmin.AdminProxy
+    let nftType: Type
 
     prepare(acct: auth(BorrowValue) &Account) {
+        self.nftType = CompositeType(nftTypeIdentifer)
+            ?? panic("Could not construct NFT type from identifier ".concat(nftTypeIdentifer))
         self.adminProxyRef = acct.storage.borrow<auth(NFTCatalogAdmin.CatalogActions) &NFTCatalogAdmin.AdminProxy>(from: NFTCatalogAdmin.AdminProxyStoragePath)!
     }
 
@@ -38,7 +41,7 @@ transaction(
         let catalogData = NFTCatalog.NFTCatalogMetadata(
             contractName: contractName,
             contractAddress: contractAddress,
-            nftType: CompositeType(nftTypeIdentifer)!,
+            nftType: self.nftType,
             collectionData: collectionData,
             collectionDisplay : collectionDisplay
         )