Skip to content

fix: Skipped accrue test #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CheyenneAtapour wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: Skipped accrue test #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f407aa0
fix: Test passing at 100k runs
CheyenneAtapour Mar 10, 2026
8cb1bf8
fix: refactor tests
CheyenneAtapour Mar 10, 2026
24fedf9
merge in main
CheyenneAtapour Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/Base.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1849,13 +1849,13 @@ abstract contract Base is Test {
assertApproxEqAbs(
actualPremiumDebt,
expectedPremiumDebt,
3,
4,
string.concat('user premium debt ', label)
);
assertApproxEqAbs(
spoke.getUserTotalDebt(reserveId, user),
expectedDrawnDebt + expectedPremiumDebt,
3,
4,
string.concat('user total debt ', label)
Comment on lines 1849 to 1859

Copilot AI Mar 10, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The assertion tolerances for premium/total debt were increased (3 -> 4) in Base helpers, which affects all tests using these helpers. Consider scoping the relaxed tolerance to the specific flaky accrual test(s) (or making the tolerance a named constant with a brief rationale) so unrelated tests don’t silently accept larger accounting drift.

Copilot uses AI. Check for mistakes.
);
}
Expand All @@ -1877,13 +1877,13 @@ abstract contract Base is Test {
assertApproxEqAbs(
actualPremiumDebt,
expectedPremiumDebt,
3,
4,
string.concat('reserve premium debt ', label)
);
assertApproxEqAbs(
spoke.getReserveTotalDebt(reserveId),
expectedDrawnDebt + expectedPremiumDebt,
3,
4,
string.concat('reserve total debt ', label)
);
}
Expand All @@ -1909,13 +1909,13 @@ abstract contract Base is Test {
assertApproxEqAbs(
actualPremiumDebt,
expectedPremiumDebt,
3,
4,
string.concat('spoke premium debt ', label)
);
assertApproxEqAbs(
hub1.getSpokeTotalOwed(assetId, address(spoke)),
expectedDrawnDebt + expectedPremiumDebt,
3,
4,
string.concat('spoke total debt ', label)
);
}
Expand All @@ -1938,13 +1938,13 @@ abstract contract Base is Test {
assertApproxEqAbs(
actualPremiumDebt,
expectedPremiumDebt,
3,
4,
string.concat('asset premium debt ', label)
);
assertApproxEqAbs(
hub1.getAssetTotalOwed(assetId),
expectedDrawnDebt + expectedPremiumDebt,
3,
4,

@yan-man yan-man Mar 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh even with the abs of 3, seems a bit much. made more sense with the old prem accounting, but feel like now it should be quite exact. Wonder why that's happening

@CheyenneAtapour CheyenneAtapour Mar 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could be 0, but it's just that I'm calculating premium debt / rp in a different way than it happens on the contract, but I think it's fine

string.concat('asset total debt ', label)
);
}
Expand Down
44 changes: 10 additions & 34 deletions tests/unit/Spoke/Spoke.AccrueInterest.Scenario.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ contract SpokeAccrueInterestScenarioTest is SpokeBase {
startTime
);
_assertProtocolSupplyAndDebt({
spoke: spoke2,
reserveId: testAmounts[i].reserveId,
user: bob,
reserveName: testAmounts[i].name,
expectedUserSupply: testAmounts[i].supplyAmount,
expectedReserveSupply: MAX_SUPPLY_AMOUNT,
Expand Down Expand Up @@ -139,7 +141,9 @@ contract SpokeAccrueInterestScenarioTest is SpokeBase {
(interest * testAmounts[i].supplyAmount) / MAX_SUPPLY_AMOUNT;

_assertProtocolSupplyAndDebt({
spoke: spoke2,
reserveId: testAmounts[i].reserveId,
user: bob,
reserveName: testAmounts[i].name,
expectedUserSupply: expectedUserSupply,
expectedReserveSupply: MAX_SUPPLY_AMOUNT + interest,
Expand Down Expand Up @@ -193,7 +197,9 @@ contract SpokeAccrueInterestScenarioTest is SpokeBase {
(interest * testAmounts[i].originalSupplyAmount) / MAX_SUPPLY_AMOUNT;

_assertProtocolSupplyAndDebt({
spoke: spoke2,
reserveId: testAmounts[i].reserveId,
user: bob,
reserveName: testAmounts[i].name,
expectedUserSupply: expectedUserSupply,
expectedReserveSupply: MAX_SUPPLY_AMOUNT + interest,
Expand All @@ -212,7 +218,9 @@ contract SpokeAccrueInterestScenarioTest is SpokeBase {
for (uint256 i = 0; i < 4; ++i) {
if (testAmounts[i].originalBorrowAmount == 0) {
_assertProtocolSupplyAndDebt({
spoke: spoke2,
reserveId: testAmounts[i].reserveId,
user: bob,
reserveName: testAmounts[i].name,
expectedUserSupply: testAmounts[i].originalSupplyAmount,
expectedReserveSupply: MAX_SUPPLY_AMOUNT,
Expand Down Expand Up @@ -245,7 +253,9 @@ contract SpokeAccrueInterestScenarioTest is SpokeBase {
(interest * testAmounts[i].originalSupplyAmount) / MAX_SUPPLY_AMOUNT;

_assertProtocolSupplyAndDebt({
spoke: spoke2,
reserveId: testAmounts[i].reserveId,
user: bob,
reserveName: testAmounts[i].name,
expectedUserSupply: expectedUserSupply,
expectedReserveSupply: MAX_SUPPLY_AMOUNT + interest,
Expand Down Expand Up @@ -381,38 +391,4 @@ contract SpokeAccrueInterestScenarioTest is SpokeBase {

return amounts;
}

function _assertProtocolSupplyAndDebt(
uint256 reserveId,
string memory reserveName,
uint256 expectedUserSupply,
uint256 expectedReserveSupply,
uint256 expectedDrawnDebt,
uint256 expectedPremiumDebt,
string memory label
) internal view {
_assertUserSupply(
spoke2,
reserveId,
bob,
expectedUserSupply,
string.concat(reserveName, label)
);
_assertReserveSupply(
spoke2,
reserveId,
expectedReserveSupply,
string.concat(reserveName, label)
);
_assertSpokeSupply(spoke2, reserveId, expectedReserveSupply, string.concat(reserveName, label));
_assertAssetSupply(spoke2, reserveId, expectedReserveSupply, string.concat(reserveName, label));
_assertSingleUserProtocolDebt(
spoke2,
reserveId,
bob,
expectedDrawnDebt,
expectedPremiumDebt,
string.concat(reserveName, label)
);
}
}
Loading
Loading