move type construction out of loop

onflow · Jan 14, 2025 · 72ca6ab · 72ca6ab
1 parent 27e6344
commit 72ca6ab
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/lib/go/templates/internal/assets/assets.go b/lib/go/templates/internal/assets/assets.go
diff --git a/transactions/generic_destroy_nft.cdc b/transactions/generic_destroy_nft.cdc
@@ -49,29 +49,29 @@ transaction(contractAddress: Address, contractName: String, nftTypeName: String,
 
     execute {
 
+        // Get the string representation of the address without the 0x
+        var addressString = contractAddress.toString()
+        if addressString.length == 18 {
+            addressString = addressString.slice(from: 2, upTo: 18)
+        }
+        let typeString: String = "A.".concat(addressString).concat(".").concat(contractName).concat(".").concat(nftTypeName)
+        let type = CompositeType(typeString)
+        assert(
+            type != nil,
+            message: "Could not create a type out of the contract name "
+                    .concat(contractName)
+                    .concat(" and address ")
+                    .concat(addressString)
+                    .concat("!")
+        )
+
         // iterate through the ids and burn each one
         for id in ids {
 
             if self.withdrawRef.borrowNFT(id) == nil { continue }
 
             let tempNFT <- self.withdrawRef.withdraw(withdrawID: id)
 
-            // Get the string representation of the address without the 0x
-            var addressString = contractAddress.toString()
-            if addressString.length == 18 {
-                addressString = addressString.slice(from: 2, upTo: 18)
-            }
-            let typeString: String = "A.".concat(addressString).concat(".").concat(contractName).concat(".").concat(nftTypeName)
-            let type = CompositeType(typeString)
-            assert(
-                type != nil,
-                message: "Could not create a type out of the contract name "
-                        .concat(contractName)
-                        .concat(" and address ")
-                        .concat(addressString)
-                        .concat("!")
-            )
-
             assert(
                 tempNFT.getType() == type!,
                 message: "The type NFT that was withdrawn to destroy <"