Skip to content

Commit 2e77d92

Browse files
nialexsannialexsan
committed
minor fixes from #183 
1 parent 0f77332 commit 2e77d92

13 files changed

Lines changed: 226 additions & 89 deletions

‎cadence/contracts/mocks/MockStrategies.cdc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ access(all) contract MockStrategies {
495495
}
496496

497497
init() {
498-
self.IssuerStoragePath = StoragePath(identifier: "FlowYieldVaultsStrategyComposerIssuer_\(self.account.address)")!
498+
self.IssuerStoragePath = StoragePath(identifier: "MockStrategiesComposerIssuer_\(self.account.address)")!
499499

500500
let initialCollateralType = Type<@FlowToken.Vault>()
501501

‎cadence/tests/PMStrategiesV1_syWFLOWv_test.cdc‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import "FlowYieldVaults"
88
import "PMStrategiesV1"
99
import "FlowYieldVaultsClosedBeta"
1010

11-
import "test_helpers.cdc"
12-
1311
/// Fork test for PMStrategiesV1 syWFLOWv strategy — validates the full YieldVault lifecycle
1412
/// (create, deposit, withdraw, close) against real mainnet state.
1513
///
@@ -55,6 +53,11 @@ access(all) var syWFLOWvYieldVaultID: UInt64 = 0
5553

5654
/* --- Test Helpers --- */
5755

56+
access(all)
57+
fun _executeScript(_ path: String, _ args: [AnyStruct]): Test.ScriptResult {
58+
return Test.executeScript(Test.readFile(path), args)
59+
}
60+
5861
access(all)
5962
fun _executeTransactionFile(_ path: String, _ args: [AnyStruct], _ signers: [Test.TestAccount]): Test.TransactionResult {
6063
let txn = Test.Transaction(
@@ -66,6 +69,14 @@ fun _executeTransactionFile(_ path: String, _ args: [AnyStruct], _ signers: [Tes
6669
return Test.executeTransaction(txn)
6770
}
6871

72+
access(all)
73+
fun equalAmounts(a: UFix64, b: UFix64, tolerance: UFix64): Bool {
74+
if a > b {
75+
return a - b <= tolerance
76+
}
77+
return b - a <= tolerance
78+
}
79+
6980
/* --- Setup --- */
7081

7182
access(all) fun setup() {

‎cadence/tests/rebalance_scenario1_test.cdc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ fun test_RebalanceYieldVaultScenario1() {
124124

125125
log("[TEST] Initial yield vault balance: \(yieldVaultBalance ?? 0.0)")
126126

127-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
128127
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
129128

130129
testSnapshot = getCurrentBlockHeight()
@@ -147,7 +146,6 @@ fun test_RebalanceYieldVaultScenario1() {
147146
let yieldTokensBefore = getAutoBalancerBalance(id: yieldVaultIDs![0]) ?? 0.0
148147
let currentValueBefore = getAutoBalancerCurrentValue(id: yieldVaultIDs![0]) ?? 0.0
149148

150-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: false, beFailed: false)
151149
rebalancePosition(signer: protocolAccount, pid: pid, force: false, beFailed: false)
152150

153151
yieldVaultBalance = getYieldVaultBalance(address: user.address, yieldVaultID: yieldVaultIDs![0])

‎cadence/tests/rebalance_scenario2_test.cdc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ fun test_RebalanceYieldVaultScenario2() {
188188

189189
log("[TEST] Initial yield vault balance: \(yieldVaultBalance ?? 0.0)")
190190

191-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
192191
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
193192

194193
for index, yieldTokenPrice in yieldPriceIncreases {

‎cadence/tests/rebalance_scenario3a_test.cdc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ fun test_RebalanceYieldVaultScenario3A() {
153153
message: "Expected MOET debt to be \(expectedDebtValues[0]) but got \(debtBefore)"
154154
)
155155

156-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
157156
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
158157

159158
// Debug: Log position details

‎cadence/tests/rebalance_scenario3b_test.cdc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ fun test_RebalanceYieldVaultScenario3B() {
153153
message: "Expected MOET debt to be \(expectedDebtValues[0]) but got \(debtBefore)"
154154
)
155155

156-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
157156
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
158157

159158
let yieldTokensAfterFlowPriceIncrease = getAutoBalancerBalance(id: yieldVaultIDs![0])!

‎cadence/tests/rebalance_scenario3c_test.cdc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ fun test_RebalanceYieldVaultScenario3C() {
153153
message: "Expected MOET debt to be \(expectedDebtValues[0]) but got \(debtBefore)"
154154
)
155155

156-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
157156
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
158157

159158
let yieldTokensAfterFlowPriceIncrease = getAutoBalancerBalance(id: yieldVaultIDs![0])!

‎cadence/tests/rebalance_scenario3d_test.cdc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ fun test_RebalanceYieldVaultScenario3D() {
153153
message: "Expected MOET debt to be \(expectedDebtValues[0]) but got \(debtBefore)"
154154
)
155155

156-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
157156
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
158157

159158
let yieldTokensAfterFlowPriceDecrease = getAutoBalancerBalance(id: yieldVaultIDs![0])!

‎cadence/tests/rebalance_scenario4_test.cdc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ fun test_RebalanceLowCollateralHighYieldPrices() {
133133
log(" FLOW collateral: \(collateralBefore) FLOW (value: \(collateralBefore * flowPriceDecrease) MOET @ $\(flowPriceDecrease)/FLOW)")
134134
log(" MOET debt: \(debtBefore) MOET")
135135

136-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
137136
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
138137

139138
let ytAfterFlowDrop = getAutoBalancerBalance(id: yieldVaultIDs![0])!
@@ -258,8 +257,7 @@ fun test_RebalanceHighCollateralLowYieldPrices() {
258257
message: "Expected health to remain above \(SOLVENT_HEALTH_FLOOR) after 20% FLOW price drop, got \(healthBeforeRebalance)")
259258

260259
// Rebalance to restore health to the strategy target.
261-
log("[Scenario5] Rebalancing position and yield vault...")
262-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
260+
log("[Scenario5] Rebalancing position...")
263261
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
264262

265263
let ytAfterFlowDrop = getAutoBalancerBalance(id: yieldVaultIDs![0])!

‎cadence/tests/rebalance_yield_test.cdc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ fun test_RebalanceYieldVaultScenario2() {
113113

114114
log("[TEST] Initial yield vault balance: \(yieldVaultBalance ?? 0.0)")
115115

116-
rebalanceYieldVault(signer: flowYieldVaultsAccount, id: yieldVaultIDs![0], force: true, beFailed: false)
117116
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
118117

119118
for index, yieldTokenPrice in yieldPriceIncreases {

0 commit comments

Comments
 (0)