Skip to content

Commit

Permalink
Refactor position calculation functions to use _fractionRemaining dir…
Browse files Browse the repository at this point in the history
…ectly
  • Loading branch information
magnetto90 committed Jan 24, 2024
1 parent 148c9d0 commit 8172b12
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions contracts/libraries/Position.sol
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,15 @@ library Position {
/// @notice accounting for amount of position remaining
/// @dev use mulUp to avoid rounding leftovers on unwind
function notionalInitial(Info memory self, uint256 fraction) internal pure returns (uint256) {
uint256 fractionRemaining = _fractionRemaining(self);
uint256 notionalForRemaining = _notionalInitial(self).mulUp(fractionRemaining);
uint256 notionalForRemaining = _notionalInitial(self).mulUp(_fractionRemaining(self));
return notionalForRemaining.mulUp(fraction);
}

/// @notice Computes the initial open interest of position when built
/// @notice accounting for amount of position remaining
/// @dev use mulUp to avoid rounding leftovers on unwind
function oiInitial(Info memory self, uint256 fraction) internal pure returns (uint256) {
uint256 fractionRemaining = _fractionRemaining(self);
uint256 oiInitialForRemaining = _oiInitial(self).mulUp(fractionRemaining);
uint256 oiInitialForRemaining = _oiInitial(self).mulUp(_fractionRemaining(self));
return oiInitialForRemaining.mulUp(fraction);
}

Expand All @@ -189,8 +187,7 @@ library Position {
/// @notice for amount of position remaining
/// @dev use mulUp to avoid rounding leftovers on unwind
function debtInitial(Info memory self, uint256 fraction) internal pure returns (uint256) {
uint256 fractionRemaining = _fractionRemaining(self);
uint256 debtForRemaining = _debtInitial(self).mulUp(fractionRemaining);
uint256 debtForRemaining = _debtInitial(self).mulUp(_fractionRemaining(self));
return debtForRemaining.mulUp(fraction);
}

Expand Down

0 comments on commit 8172b12

Please sign in to comment.