Skip to content

Commit eebd00d

Browse files
kgrgpgkgrgpg
committed
generator: correct Actions handling (Bal→tide, Borrow/Repay→protocol) and regenerate tests; update drift report; keep strict tolerance
1 parent bd2634b commit eebd00d

19 files changed

+304
-120
lines changed

‎cadence/tests/rebalance_scenario2_instant_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario2_Instant() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario4_volatilemarkets_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario4_VolatileMarkets() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario5_gradualtrends_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario5_GradualTrends() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario6_edgecases_test.cdc‎

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario6_EdgeCases_VeryLowFlow() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {
@@ -293,7 +301,15 @@ fun test_RebalanceTideScenario6_EdgeCases_VeryHighFlow() {
293301
let parts = a.split(separator: "|")
294302
var idx: Int = 0
295303
while idx < parts.length {
296-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
304+
let p = parts[idx]
305+
if p.contains("Bal") {
306+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
307+
} else if p.contains("Borrow") || p.contains("Repay") {
308+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
309+
} else {
310+
// Default to Tide rebalance if action token is unrecognized
311+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
312+
}
297313
idx = idx + 1
298314
}
299315
} else {
@@ -403,7 +419,15 @@ fun test_RebalanceTideScenario6_EdgeCases_VeryHighYield() {
403419
let parts = a.split(separator: "|")
404420
var idx: Int = 0
405421
while idx < parts.length {
406-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
422+
let p = parts[idx]
423+
if p.contains("Bal") {
424+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
425+
} else if p.contains("Borrow") || p.contains("Repay") {
426+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
427+
} else {
428+
// Default to Tide rebalance if action token is unrecognized
429+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
430+
}
407431
idx = idx + 1
408432
}
409433
} else {
@@ -513,7 +537,15 @@ fun test_RebalanceTideScenario6_EdgeCases_BothVeryLow() {
513537
let parts = a.split(separator: "|")
514538
var idx: Int = 0
515539
while idx < parts.length {
516-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
540+
let p = parts[idx]
541+
if p.contains("Bal") {
542+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
543+
} else if p.contains("Borrow") || p.contains("Repay") {
544+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
545+
} else {
546+
// Default to Tide rebalance if action token is unrecognized
547+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
548+
}
517549
idx = idx + 1
518550
}
519551
} else {
@@ -623,7 +655,15 @@ fun test_RebalanceTideScenario6_EdgeCases_MinimalPosition() {
623655
let parts = a.split(separator: "|")
624656
var idx: Int = 0
625657
while idx < parts.length {
626-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
658+
let p = parts[idx]
659+
if p.contains("Bal") {
660+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
661+
} else if p.contains("Borrow") || p.contains("Repay") {
662+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
663+
} else {
664+
// Default to Tide rebalance if action token is unrecognized
665+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
666+
}
627667
idx = idx + 1
628668
}
629669
} else {
@@ -733,7 +773,15 @@ fun test_RebalanceTideScenario6_EdgeCases_LargePosition() {
733773
let parts = a.split(separator: "|")
734774
var idx: Int = 0
735775
while idx < parts.length {
736-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
776+
let p = parts[idx]
777+
if p.contains("Bal") {
778+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
779+
} else if p.contains("Borrow") || p.contains("Repay") {
780+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
781+
} else {
782+
// Default to Tide rebalance if action token is unrecognized
783+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
784+
}
737785
idx = idx + 1
738786
}
739787
} else {

‎cadence/tests/rebalance_scenario7_multisteppaths_bear_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario7_MultiStepPaths_Bear() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario7_multisteppaths_bull_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario7_MultiStepPaths_Bull() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario7_multisteppaths_crisis_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario7_MultiStepPaths_Crisis() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario7_multisteppaths_sideways_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario7_MultiStepPaths_Sideways() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario8_randomwalks_walk0_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario8_RandomWalks_Walk0() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

‎cadence/tests/rebalance_scenario8_randomwalks_walk1_test.cdc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ fun test_RebalanceTideScenario8_RandomWalks_Walk1() {
183183
let parts = a.split(separator: "|")
184184
var idx: Int = 0
185185
while idx < parts.length {
186-
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
186+
let p = parts[idx]
187+
if p.contains("Bal") {
188+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
189+
} else if p.contains("Borrow") || p.contains("Repay") {
190+
rebalancePosition(signer: protocolAccount, pid: pid, force: true, beFailed: false)
191+
} else {
192+
// Default to Tide rebalance if action token is unrecognized
193+
rebalanceTide(signer: tidalYieldAccount, id: tideIDs![0], force: true, beFailed: false)
194+
}
187195
idx = idx + 1
188196
}
189197
} else {

0 commit comments

Comments
 (0)