fix l8

src/services/debit/GmxService.sol

@@ -136,7 +136,7 @@ contract GmxService is AuctionRateModel, DebitService {
 
     function quote(Agreement memory agreement) public view override returns (uint256[] memory) {
         uint256[] memory results = new uint256[](1);
-        uint256 aumInUsdg = glpManager.getAumInUsdg(false);
+        uint256 aumInUsdg = glpManager.getAumInUsdg(true);
         uint256 glpSupply = glp.totalSupply();
 
         if (glpSupply == 0) revert ZeroGlpSupply();
@@ -146,7 +146,7 @@ contract GmxService is AuctionRateModel, DebitService {
 
         uint256 feeBasisPoints = usdgVault.getFeeBasisPoints(
             agreement.loans[0].token,
-            usdgDelta,
+            usdgAmount,
             usdgVault.swapFeeBasisPoints(),
             usdgVault.taxBasisPoints(),
             false

test/services/AaveService.general.test.sol

@@ -132,14 +132,15 @@ contract AaveGeneralTest is Test, IERC721Receiver {
         return order;
     }
 
-    function _openOrder(uint256 vaultAmount, uint256 loan, uint256 margin, uint64 warp) internal {
+    function _openOrder(uint256 vaultAmount, uint256 loan, uint256 margin, uint64 warp) internal returns (bool) {
         warp = warp % (365 * 86400); // Warp 1y maximum
         (loan, margin) = _prepareVaultAndUser(vaultAmount, loan, margin);
         IService.Order memory order = _prepareOrder(loan, margin);
         // No need to check invariants: they are already checked in other tests
-        if (order.agreement.loans[0].margin < 1e6) return;
+        if (order.agreement.loans[0].margin < 1e6) return false;
         service.open(order);
         vm.warp(block.timestamp + warp);
+        return true;
     }
 
     function _getInterestAndSpread(uint256 tokenID) internal returns (uint256, uint256) {
@@ -248,14 +249,16 @@ contract AaveGeneralTest is Test, IERC721Receiver {
     }
 
     function testInterestRateChange(uint256 vaultAmount, uint256 loan, uint256 margin, uint64 warp) public {
-        _openOrder(vaultAmount, loan, margin, warp);
-        (uint256 interest1, ) = _getInterestAndSpread(0);
+        uint256 interest1;
+        uint256 interest2;
+        bool opened = _openOrder(vaultAmount, loan, margin, warp);
+        if (opened) (interest1, ) = _getInterestAndSpread(0);
         // Open a new order: time is already warped by "warp" after first one
-        _openOrder(vaultAmount, loan, margin, 0);
+        opened = _openOrder(vaultAmount, loan, margin, 0);
         // there is a chance that latest order was not open due to margin constraint
         // I add this check to avoid index out of bounds
         if (service.id() > 1) {
-            (uint256 interest2, ) = _getInterestAndSpread(1);
+            if (opened) (interest2, ) = _getInterestAndSpread(1);
             uint256 rateDecay = warp < 2 * service.halvingTime(loanTokens[0])
                 ? (interest1 * (2 * service.halvingTime(loanTokens[0]) - warp)) /
                     (2 * service.halvingTime(loanTokens[0]))

test/services/GmxService.test.sol

@@ -53,8 +53,8 @@ contract GmxServiceTest is BaseIntegrationServiceTest {
     }
 
     function _equalityWithTolerance(uint256 amount1, uint256 amount2, uint256 tolerance) internal {
-        assertGe(amount1 + tolerance, amount2);
-        assertGe(amount2 + tolerance, amount1);
+        assertGe(amount1 + tolerance, amount2, "amount1 + tolerance >= amount2 failed");
+        assertGe(amount2 + tolerance, amount1, "amount2 + tolerance >= amount1 failed");
     }
 
     function setUp() public override {
@@ -185,13 +185,9 @@ contract GmxServiceTest is BaseIntegrationServiceTest {
             .getAgreement(0);
 
         IService.Agreement memory agreement = IService.Agreement(loan, collaterals, createdAt, IService.Status.OPEN);
-
+        uint256 quoted = service.quote(agreement)[0];
         service.close(0, abi.encode(uint256(1)));
-        _equalityWithTolerance(
-            usdc.balanceOf(address(this)),
-            initial + service.quote(agreement)[0] - loan[0].amount,
-            1
-        );
+        _equalityWithTolerance(usdc.balanceOf(address(this)), initial + quoted - loan[0].amount, 1);
     }
 
     // setting to private since it becomes too heavy