Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/spoke/Spoke.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/spoke/libraries/LiquidationLogic.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/spoke/libraries/UserPositionDebt.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions tests/mocks/UserPositionDebtWrapper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/libraries/UserPositionDebt.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
Expand Down
Loading