Clean up discarded function call results

cadence/contracts/PMStrategiesV1.cdc

@@ -849,7 +849,7 @@ access(all) contract PMStrategiesV1 {
         }
 
         access(contract) fun removePendingRedeem(id: UInt64) {
-            self.pendingRedeems.remove(key: id)
+            let _removedRedeem = self.pendingRedeems.remove(key: id)
         }
 
         access(contract) view fun getPendingRedeem(id: UInt64): PendingRedeemInfo? {
@@ -897,7 +897,7 @@ access(all) contract PMStrategiesV1 {
             }
             let entry: auth(Remove) &AnyStruct = &self.metadata["claimOutcomes"]!
             let outcomes = entry as! auth(Remove) &{UInt64: String}
-            outcomes.remove(key: yieldVaultID)
+            let _removedOutcome = outcomes.remove(key: yieldVaultID)
         }
 
         access(contract) view fun getClaimOutcome(yieldVaultID: UInt64): String? {

cadence/contracts/mocks/EVM.cdc

@@ -750,7 +750,7 @@ contract EVM {
                         )
                     }
 
-                    keyList.add(
+                    let _keyIndex = keyList.add(
                       key.publicKey,
                       hashAlgorithm: key.hashAlgorithm,
                       // normalization factor. We need to divide by 1000 because the

cadence/contracts/mocks/FlowTransactionScheduler.cdc

@@ -488,7 +488,7 @@ access(all) contract FlowTransactionScheduler {
         access(all) fun remove(timestamp: UFix64) {
             // Only remove if the timestamp is in the array
             if let index = self.timestamps.firstIndex(of: timestamp) {
-                self.timestamps.remove(at: index)
+                let _removedTimestamp = self.timestamps.remove(at: index)
             }
         }
 
@@ -605,7 +605,7 @@ access(all) contract FlowTransactionScheduler {
         /// txRemovalLimit) require explicit authorization from the contract administrator.
         access(UpdateConfig) fun setConfig(newConfig: {SchedulerConfig}, txRemovalLimit: UInt) {
             self.config = newConfig
-            FlowTransactionScheduler.account.storage.load<UInt>(from: /storage/txRemovalLimit)
+            let _oldLimit = FlowTransactionScheduler.account.storage.load<UInt>(from: /storage/txRemovalLimit)
             FlowTransactionScheduler.account.storage.save(txRemovalLimit, to: /storage/txRemovalLimit)
             emit ConfigUpdated()
         }
@@ -1032,7 +1032,7 @@ access(all) contract FlowTransactionScheduler {
             if let priorityQueue = transactionQueue[transactionPriority] {
                 priorityQueue[transactionID] = nil
                 if priorityQueue.keys.length == 0 {
-                    transactionQueue.remove(key: transactionPriority)
+                    let _removedPriorityQueue = transactionQueue.remove(key: transactionPriority)
                 } else {
                     transactionQueue[transactionPriority] = priorityQueue
                 }
@@ -1041,8 +1041,8 @@ access(all) contract FlowTransactionScheduler {
 
             // if the slot is now empty remove it from the maps
             if transactionQueue.keys.length == 0 {
-                self.slotQueue.remove(key: slot)
-                self.slotUsedEffort.remove(key: slot)
+                let _removedSlotQueue = self.slotQueue.remove(key: slot)
+                let _removedSlotEffort = self.slotUsedEffort.remove(key: slot)
 
                 self.sortedTimestamps.remove(timestamp: slot)
             }
@@ -1154,7 +1154,7 @@ access(all) contract FlowTransactionScheduler {
                         // charge the full fee for transaction execution
                         destroy tx!.payAndRefundFees(refundMultiplier: 0.0)
 
-                        self.removeTransaction(txData: tx!)
+                        let _removedExpiredTx = self.removeTransaction(txData: tx!)
                     }
                 }
             }
@@ -1243,7 +1243,7 @@ access(all) contract FlowTransactionScheduler {
 
             // keep the array under the limit
             if UInt(self.canceledTransactions.length) > self.config.canceledTransactionsLimit {
-                self.canceledTransactions.remove(at: 0)
+                let _removedOldestCanceled = self.canceledTransactions.remove(at: 0)
             }
 
             emit Canceled(
@@ -1255,8 +1255,8 @@ access(all) contract FlowTransactionScheduler {
                 transactionHandlerTypeIdentifier: tx.handlerTypeIdentifier
             )
 
-            self.removeTransaction(txData: tx)
-            
+            let _removedCanceledTx = self.removeTransaction(txData: tx)
+
             return <-refundedFees
         }
 
@@ -1436,7 +1436,7 @@ access(all) contract FlowTransactionScheduler {
         let storageUsedBefore = self.account.storage.used
         self.account.storage.save(data!, to: storagePath)
         let storageUsedAfter = self.account.storage.used
-        self.account.storage.load<AnyStruct>(from: storagePath)
+        let _loadedData = self.account.storage.load<AnyStruct>(from: storagePath)
 
         return FlowStorageFees.convertUInt64StorageBytesToUFix64Megabytes(storageUsedAfter.saturatingSubtract(storageUsedBefore))
     }

cadence/tests/atomic_registration_gc_test.cdc

@@ -31,7 +31,7 @@ access(all) fun setup() {
     let reserveAmount = 100_000_00.0
     setupMoetVault(protocolAccount, beFailed: false)
     setupYieldVault(protocolAccount, beFailed: false)
-    mintFlow(to: protocolAccount, amount: reserveAmount)
+    let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
     mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
     setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -70,13 +70,13 @@ access(all) fun setup() {
     // Scheduler contracts are deployed as part of deployContracts()
 
     // Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-    mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+    let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 }
 
 access(all) fun testAtomicRegistrationAndGC() {
     let user = Test.createAccount()
     let fundingAmount = 100.0
-    mintFlow(to: user, amount: fundingAmount)
+    let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
 
     // Grant Beta Access
     let betaRef = grantBeta(flowYieldVaultsAccount, user)

cadence/tests/create_yield_vault_manager_validation_test.cdc

@@ -22,7 +22,7 @@ fun test_CreateYieldVaultManagerValidatesBetaRef() {
 
     let user = Test.createAccount()
     transferFlow(signer: serviceAccount, recipient: user.address, amount: 1.0)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     let txn = Test.Transaction(
         code: Test.readFile("../transactions/test/create_yield_vault_manager_with_beta_cap.cdc"),

cadence/tests/forked_rebalance_boundary_test.cdc

@@ -220,8 +220,8 @@ fun test_UpperBoundary() {
     let user = Test.createAccount()
     let fundingAmount = 1000.0
 
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(
@@ -425,8 +425,8 @@ fun test_LowerBoundary() {
     let user = Test.createAccount()
     let fundingAmount = 1000.0
 
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     setVaultSharePrice(
         vaultAddress: morphoVaultAddress,

cadence/tests/forked_rebalance_scenario1_test.cdc

@@ -202,9 +202,9 @@ fun test_ForkedRebalanceYieldVaultScenario1() {
 	}
 
 	// 	confirm user exists.
-	getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _userBalance = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(

cadence/tests/forked_rebalance_scenario2_test.cdc

@@ -342,8 +342,8 @@ fun test_RebalanceYieldVaultScenario2() {
 
 	// Likely 0.0
 	let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(

cadence/tests/forked_rebalance_scenario3a_test.cdc

@@ -149,8 +149,8 @@ fun test_RebalanceYieldVaultScenario3A() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     // Use 1 billion (1e9) as base - large enough to prevent slippage, safe from UFix64 overflow

cadence/tests/forked_rebalance_scenario3b_test.cdc

@@ -147,8 +147,8 @@ fun test_RebalanceYieldVaultScenario3B() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(

cadence/tests/forked_rebalance_scenario3c_test.cdc

@@ -148,8 +148,8 @@ fun test_ForkedRebalanceYieldVaultScenario3C() {
 
     // Likely 0.0
     let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(

cadence/tests/forked_rebalance_scenario3d_test.cdc

@@ -149,8 +149,8 @@ fun test_ForkedRebalanceYieldVaultScenario3D() {
 
     // Likely 0.0
     let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-    transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+    let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     // Set vault to baseline 1:1 price
     setVaultSharePrice(

cadence/tests/forked_rebalance_scenario4_test.cdc

@@ -171,8 +171,8 @@ fun test_RebalanceLowCollateralHighYieldPrices() {
 	let yieldPriceIncrease = 1500.0 // YT:   $1000.0 → $1500.0
 
 	let user = Test.createAccount()
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-	grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+	let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,
@@ -345,8 +345,8 @@ fun test_RebalanceHighCollateralLowYieldPrices() {
 	let yieldPriceIncrease = 1.5      // YT: $1.0 → $1.5
 
 	let user = Test.createAccount()
-	transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
-	grantBeta(flowYieldVaultsAccount, user)
+	let _transferFlowResult = transferFlow(signer: whaleFlowAccount, recipient: user.address, amount: fundingAmount)
+	let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,

cadence/tests/grant_beta_cleanup_test.cdc

@@ -16,13 +16,13 @@ fun test_ReGrantBetaRevokesPreviousCapability() {
     let user = Test.createAccount()
     transferFlow(signer: serviceAccount, recipient: user.address, amount: 1.0)
 
-    grantBeta(flowYieldVaultsAccount, user)
+    let _grantedBetaFirst = grantBeta(flowYieldVaultsAccount, user)
 
     let backupRes = _executeTransaction("../transactions/test/backup_beta_cap.cdc", [], user)
     Test.expect(backupRes, Test.beSucceeded())
 
     // Re-granting should revoke the previously issued controller (and thus all old capability copies).
-    grantBeta(flowYieldVaultsAccount, user)
+    let _grantedBetaSecond = grantBeta(flowYieldVaultsAccount, user)
 
     // Event assertions: the re-grant should emit BetaRevoked for the *previous* capID, then a fresh BetaGranted.
     let grantedAny = Test.eventsOfType(Type<FlowYieldVaultsClosedBeta.BetaGranted>())

cadence/tests/rebalance_scenario1_test.cdc

@@ -35,7 +35,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -73,7 +73,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -103,8 +103,8 @@ fun test_RebalanceYieldVaultScenario1() {
 
 	// Likely 0.0
 	let _flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,

cadence/tests/rebalance_scenario2_test.cdc

@@ -104,7 +104,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -142,7 +142,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -167,8 +167,8 @@ fun test_RebalanceYieldVaultScenario2() {
 
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,

cadence/tests/rebalance_scenario3a_test.cdc

@@ -36,7 +36,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -74,7 +74,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -96,8 +96,8 @@ fun test_RebalanceYieldVaultScenario3A() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,

cadence/tests/rebalance_scenario3b_test.cdc

@@ -36,7 +36,7 @@ fun setup() {
 	let reserveAmount = 100_000_00.0
 	setupMoetVault(protocolAccount, beFailed: false)
 	setupYieldVault(protocolAccount, beFailed: false)
-	mintFlow(to: protocolAccount, amount: reserveAmount)
+	let _mintedFlowReserve = mintFlow(to: protocolAccount, amount: reserveAmount)
 	mintMoet(signer: protocolAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	mintYield(signer: yieldTokenAccount, to: protocolAccount.address, amount: reserveAmount, beFailed: false)
 	setMockSwapperLiquidityConnector(signer: protocolAccount, vaultStoragePath: MOET.VaultStoragePath)
@@ -74,7 +74,7 @@ fun setup() {
 	)
 
 	// Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
-	mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
+	let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 
 	snapshot = getCurrentBlockHeight()
 }
@@ -96,8 +96,8 @@ fun test_RebalanceYieldVaultScenario3B() {
 	// Likely 0.0
 	let flowBalanceBefore = getBalance(address: user.address, vaultPublicPath: /public/flowTokenReceiver)!
 	log("[TEST] flow balance before \(flowBalanceBefore)")
-	mintFlow(to: user, amount: fundingAmount)
-    grantBeta(flowYieldVaultsAccount, user)
+	let _mintedFlowUser = mintFlow(to: user, amount: fundingAmount)
+    let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
 	createYieldVault(
 		signer: user,