Move mock contracts and test helpers into cadence/tests

Author: holyfuchs

cadence/tests/PMStrategiesV1_FUSDEV_test.cdc

@@ -148,7 +148,7 @@ access(all) fun setup() {
     // Grant beta access to user account for testing yield vault operations
     log("Granting beta access to user...")
     var result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/admin/grant_beta.cdc",
+        "../transactions/admin/grant_beta.cdc",
         [],
         [adminAccount, userAccount]
     )
@@ -162,7 +162,7 @@ access(all) fun setup() {
 access(all) fun testCreateFUSDEVYieldVault() {
     log("Creating FUSDEVStrategy yield vault with 1.0 PYUSD0...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/create_yield_vault.cdc",
+        "../transactions/create_yield_vault.cdc",
         [fusdEvStrategyIdentifier, pyusd0VaultIdentifier, 1.0],
         [userAccount]
     )
@@ -194,7 +194,7 @@ access(all) fun testCreateFUSDEVYieldVault() {
 access(all) fun testDepositToFUSDEVYieldVault() {
     log("Depositing 0.5 PYUSD0 to FUSDEV yield vault...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/deposit_to_yield_vault.cdc",
+        "../transactions/deposit_to_yield_vault.cdc",
         [fusdEvYieldVaultID, 0.5],
         [userAccount]
     )
@@ -213,7 +213,7 @@ access(all) fun testDepositToFUSDEVYieldVault() {
 access(all) fun testWithdrawFromFUSDEVYieldVault() {
     log("Withdrawing 0.3 PYUSD0 from FUSDEV yield vault...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/withdraw_from_yield_vault.cdc",
+        "../transactions/withdraw_from_yield_vault.cdc",
         [fusdEvYieldVaultID, 0.3],
         [userAccount]
     )
@@ -232,7 +232,7 @@ access(all) fun testWithdrawFromFUSDEVYieldVault() {
 access(all) fun testCloseFUSDEVYieldVault() {
     log("Closing FUSDEV yield vault...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/close_yield_vault.cdc",
+        "../transactions/close_yield_vault.cdc",
         [fusdEvYieldVaultID],
         [userAccount]
     )

cadence/tests/PMStrategiesV1_deferred_redeem_test.cdc

@@ -152,15 +152,15 @@ access(all) fun setup() {
     // Grant beta access
     log("Granting beta access...")
     result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/admin/grant_beta.cdc",
+        "../transactions/admin/grant_beta.cdc",
         [],
         [adminAccount, userAccount]
     )
     Test.expect(result, Test.beSucceeded())
 
     log("Initializing PendingRedeemHandler...")
     result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/admin/init_pending_redeem_handler.cdc",
+        "../transactions/admin/init_pending_redeem_handler.cdc",
         [],
         []
     )
@@ -186,7 +186,7 @@ access(all) fun setup() {
 access(all) fun testCreateYieldVaultForDeferredRedeem() {
     log("Creating syWFLOWv yield vault with 2.0 FLOW...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/create_yield_vault.cdc",
+        "../transactions/create_yield_vault.cdc",
         [syWFLOWvStrategyIdentifier, flowVaultIdentifier, 2.0],
         [userAccount]
     )

cadence/tests/PMStrategiesV1_syWFLOWv_test.cdc

@@ -163,7 +163,7 @@ access(all) fun setup() {
     // Grant beta access to user account for testing yield vault operations
     log("Granting beta access to user...")
     result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/admin/grant_beta.cdc",
+        "../transactions/admin/grant_beta.cdc",
         [],
         [adminAccount, userAccount]
     )
@@ -177,7 +177,7 @@ access(all) fun setup() {
 access(all) fun testCreateSyWFLOWvYieldVault() {
     log("Creating syWFLOWvStrategy yield vault with 1.0 FLOW...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/create_yield_vault.cdc",
+        "../transactions/create_yield_vault.cdc",
         [syWFLOWvStrategyIdentifier, flowVaultIdentifier, 1.0],
         [userAccount]
     )
@@ -217,7 +217,7 @@ access(all) fun testDepositToSyWFLOWvYieldVault() {
     let depositAmount: UFix64 = 0.5
     log("Depositing 0.5 FLOW to syWFLOWv yield vault...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/deposit_to_yield_vault.cdc",
+        "../transactions/deposit_to_yield_vault.cdc",
         [syWFLOWvYieldVaultID, depositAmount],
         [userAccount]
     )
@@ -247,7 +247,7 @@ access(all) fun testWithdrawFromSyWFLOWvYieldVault() {
     let withdrawAmount: UFix64 = 0.3
     log("Withdrawing 0.3 FLOW from syWFLOWv yield vault...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/withdraw_from_yield_vault.cdc",
+        "../transactions/withdraw_from_yield_vault.cdc",
         [syWFLOWvYieldVaultID, withdrawAmount],
         [userAccount]
     )
@@ -283,7 +283,7 @@ access(all) fun testCloseSyWFLOWvYieldVault() {
 
     log("Closing syWFLOWv yield vault...")
     let result = _executeTransactionFile(
-        "../transactions/flow-yield-vaults/close_yield_vault.cdc",
+        "../transactions/close_yield_vault.cdc",
         [syWFLOWvYieldVaultID],
         [userAccount]
     )

cadence/tests/atomic_registration_gc_test.cdc

@@ -68,7 +68,7 @@ access(all) fun setup() {
     )
 
     // Scheduler contracts are deployed as part of deployContracts()
-    
+
     // Fund FlowYieldVaults account for scheduling fees (atomic initial scheduling)
     let _mintedFlowFees = mintFlow(to: flowYieldVaultsAccount, amount: 100.0)
 }
@@ -84,7 +84,7 @@ access(all) fun testAtomicRegistrationAndGC() {
 
     // 1. Create YieldVault (Atomic Registration)
     let createYieldVaultRes = executeTransaction(
-        "../transactions/flow-yield-vaults/create_yield_vault.cdc",
+        "../transactions/create_yield_vault.cdc",
         [strategyIdentifier, flowTokenIdentifier, fundingAmount],
         user
     )
@@ -116,7 +116,7 @@ access(all) fun testAtomicRegistrationAndGC() {
 
     // 2. Close YieldVault (Garbage Collection)
     let closeYieldVaultRes = executeTransaction(
-        "../transactions/flow-yield-vaults/close_yield_vault.cdc",
+        "../transactions/close_yield_vault.cdc",
         [yieldVaultID],
         user
     )

cadence/tests/create_yield_vault_manager_validation_test.cdc

@@ -15,7 +15,7 @@ fun test_CreateYieldVaultManagerValidatesBetaRef() {
     // This lets us assert that `FlowYieldVaults.createYieldVaultManager` actually calls `validateBeta`.
     let err = Test.deployContract(
         name: "FlowYieldVaultsClosedBeta",
-        path: "../contracts/mocks/FlowYieldVaultsClosedBeta_validate_beta_false.cdc",
+        path: "mocks/FlowYieldVaultsClosedBeta_validate_beta_false.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
@@ -25,7 +25,7 @@ fun test_CreateYieldVaultManagerValidatesBetaRef() {
     let _grantBetaResult = grantBeta(flowYieldVaultsAccount, user)
 
     let txn = Test.Transaction(
-        code: Test.readFile("../transactions/test/create_yield_vault_manager_with_beta_cap.cdc"),
+        code: Test.readFile("transactions/test/create_yield_vault_manager_with_beta_cap.cdc"),
         authorizers: [user.address],
         signers: [user],
         arguments: []

cadence/tests/grant_beta_cleanup_test.cdc

@@ -18,7 +18,7 @@ fun test_ReGrantBetaRevokesPreviousCapability() {
 
     let _grantedBetaFirst = grantBeta(flowYieldVaultsAccount, user)
 
-    let backupRes = _executeTransaction("../transactions/test/backup_beta_cap.cdc", [], 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).
@@ -48,6 +48,6 @@ fun test_ReGrantBetaRevokesPreviousCapability() {
     Test.assertEqual(userGrants[0].capID, userRevokes[0].capID!)
     Test.assert(userGrants[0].capID != userGrants[1].capID, message: "Expected a fresh capID on re-grant")
 
-    let assertRes = _executeTransaction("../transactions/test/assert_backup_beta_cap_revoked.cdc", [], user)
+    let assertRes = _executeTransaction("transactions/test/assert_backup_beta_cap_revoked.cdc", [], user)
     Test.expect(assertRes, Test.beSucceeded())
 }