From 156bc2bf919c168fdec01ee341999cb14ab9d685 Mon Sep 17 00:00:00 2001 From: CheyenneAtapour Date: Mon, 5 Jan 2026 18:26:00 +0800 Subject: [PATCH] style: Rename calculatePremiumDelta --- src/spoke/Spoke.sol | 6 +++--- src/spoke/libraries/LiquidationLogic.sol | 2 +- src/spoke/libraries/UserPositionDebt.sol | 2 +- tests/mocks/UserPositionDebtWrapper.sol | 4 ++-- tests/unit/libraries/UserPositionDebt.t.sol | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/spoke/Spoke.sol b/src/spoke/Spoke.sol index d71faaa03..3823f5170 100644 --- a/src/spoke/Spoke.sol +++ b/src/spoke/Spoke.sol @@ -316,7 +316,7 @@ abstract contract Spoke is ISpoke, Multicall, NoncesKeyed, AccessManagedUpgradea .calculateRestoreAmount(drawnIndex, amount); uint256 restoredShares = drawnDebtRestored.rayDivDown(drawnIndex); - IHubBase.PremiumDelta memory premiumDelta = userPosition.getPremiumDelta({ + IHubBase.PremiumDelta memory premiumDelta = userPosition.calculatePremiumDelta({ drawnSharesTaken: restoredShares, drawnIndex: drawnIndex, riskPremium: _positionStatus[onBehalfOf].riskPremium, @@ -843,7 +843,7 @@ abstract contract Spoke is ISpoke, Multicall, NoncesKeyed, AccessManagedUpgradea uint256 assetId = reserve.assetId; IHubBase hub = reserve.hub; - IHubBase.PremiumDelta memory premiumDelta = userPosition.getPremiumDelta({ + IHubBase.PremiumDelta memory premiumDelta = userPosition.calculatePremiumDelta({ drawnSharesTaken: 0, drawnIndex: hub.getAssetDrawnIndex(assetId), riskPremium: newRiskPremium, @@ -874,7 +874,7 @@ abstract contract Spoke is ISpoke, Multicall, NoncesKeyed, AccessManagedUpgradea (uint256 drawnDebtReported, uint256 premiumDebtRay) = userPosition.getDebt(drawnIndex); uint256 deficitShares = drawnDebtReported.rayDivDown(drawnIndex); - IHubBase.PremiumDelta memory premiumDelta = userPosition.getPremiumDelta({ + IHubBase.PremiumDelta memory premiumDelta = userPosition.calculatePremiumDelta({ drawnSharesTaken: deficitShares, drawnIndex: drawnIndex, riskPremium: 0, diff --git a/src/spoke/libraries/LiquidationLogic.sol b/src/spoke/libraries/LiquidationLogic.sol index d141e8b53..7d8ed61f2 100644 --- a/src/spoke/libraries/LiquidationLogic.sol +++ b/src/spoke/libraries/LiquidationLogic.sol @@ -324,7 +324,7 @@ library LiquidationLogic { uint256 drawnDebtLiquidated = params.debtToLiquidate - premiumDebtToLiquidateRay.fromRayUp(); uint256 drawnSharesLiquidated = drawnDebtLiquidated.rayDivDown(params.drawnIndex); - IHubBase.PremiumDelta memory premiumDelta = debtPosition.getPremiumDelta({ + IHubBase.PremiumDelta memory premiumDelta = debtPosition.calculatePremiumDelta({ drawnSharesTaken: drawnSharesLiquidated, drawnIndex: params.drawnIndex, riskPremium: positionStatus.riskPremium, diff --git a/src/spoke/libraries/UserPositionDebt.sol b/src/spoke/libraries/UserPositionDebt.sol index 6c9543808..ab497edd2 100644 --- a/src/spoke/libraries/UserPositionDebt.sol +++ b/src/spoke/libraries/UserPositionDebt.sol @@ -42,7 +42,7 @@ library UserPositionDebt { /// @param riskPremium The new risk premium, expressed in BPS. /// @param restoredPremiumRay The amount of premium to be restored, expressed in asset units and scaled by RAY. /// @return The calculated premium delta. - function getPremiumDelta( + function calculatePremiumDelta( ISpoke.UserPosition storage userPosition, uint256 drawnSharesTaken, uint256 drawnIndex, diff --git a/tests/mocks/UserPositionDebtWrapper.sol b/tests/mocks/UserPositionDebtWrapper.sol index 2f3ebedcb..ec4b488ae 100644 --- a/tests/mocks/UserPositionDebtWrapper.sol +++ b/tests/mocks/UserPositionDebtWrapper.sol @@ -21,14 +21,14 @@ contract UserPositionDebtWrapper { UserPositionDebt.applyPremiumDelta(_userPosition, premiumDelta); } - function getPremiumDelta( + function calculatePremiumDelta( uint256 drawnSharesTaken, uint256 drawnIndex, uint256 riskPremium, uint256 restoredPremiumRay ) external view returns (IHubBase.PremiumDelta memory) { return - UserPositionDebt.getPremiumDelta( + UserPositionDebt.calculatePremiumDelta( _userPosition, drawnSharesTaken, drawnIndex, diff --git a/tests/unit/libraries/UserPositionDebt.t.sol b/tests/unit/libraries/UserPositionDebt.t.sol index d45b236d1..26c9b7843 100644 --- a/tests/unit/libraries/UserPositionDebt.t.sol +++ b/tests/unit/libraries/UserPositionDebt.t.sol @@ -64,12 +64,12 @@ contract UserPositionDebtTest is Base { assertEq(u.getUserPosition().premiumOffsetRay, -90e18 * 1e27); } - function test_fuzz_getPremiumDelta(BoundParams memory params) public { + function test_fuzz_calculatePremiumDelta(BoundParams memory params) public { params = _bound(params); _mockUserDrawnShares(params.drawnShares); _mockUserPremiumData(params.premiumShares, params.premiumOffsetRay); assertEq( - u.getPremiumDelta( + u.calculatePremiumDelta( params.drawnSharesTaken, params.drawnIndex, params.riskPremium, @@ -86,9 +86,9 @@ contract UserPositionDebtTest is Base { ); } - function test_getPremiumDelta() public view { + function test_calculatePremiumDelta() public view { assertEq( - u.getPremiumDelta(0, DRAWN_INDEX, 20_00, 48.5e18 * 1e27), + u.calculatePremiumDelta(0, DRAWN_INDEX, 20_00, 48.5e18 * 1e27), IHubBase.PremiumDelta({ sharesDelta: -59e18, // 40 - 99 offsetRayDelta: -40e18 * 1e27, // (60 - (248.5 - 48.5)) - (-100)