Skip to content

Commit 4f4b660

Browse files
committed
fmt: running forge fmt with foundryup to pass ci
1 parent 3cdfba6 commit 4f4b660

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

src/RolloverVault.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ contract RolloverVault is LiquidityVault, IRolloverVault {
132132
uint256 ogPoolConsolBalance = IERC20(consol()).balanceOf(address(ogPool));
133133
uint256 ogPoolBalance = ogPool.balanceOf(address(this));
134134
total += Math.mulDiv(ogPoolBalance, ogPoolUsdxBalance, ogPoolTotalSupply)
135-
+ Math.mulDiv(ogPoolBalance, ogPoolConsolBalance, ogPoolTotalSupply);
135+
+ Math.mulDiv(ogPoolBalance, ogPoolConsolBalance, ogPoolTotalSupply);
136136
}
137137
// Add the USDX and Consol balances that are currently in the rollover vault
138138
total += IERC20(usdx()).balanceOf(address(this)) + IERC20(consol()).balanceOf(address(this));

src/Router.sol

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,13 @@ contract Router is
206206
if (creationRequest.base.isCompounding) {
207207
for (uint256 i = 0; i < creationRequest.base.originationPools.length; i++) {
208208
// If compounding, need to collect 1/2 of the collateral amount + commission fee (this is in the form of collateral)
209-
collateralCollected += IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(
210-
(creationRequest.base.collateralAmounts[i] + 1) / 2
211-
);
209+
collateralCollected += IOriginationPool(creationRequest.base.originationPools[i])
210+
.calculateReturnAmount((creationRequest.base.collateralAmounts[i] + 1) / 2);
212211
(uint256 _cost, uint8 _collateralDecimals) =
213212
_calculateCost(creationRequest.collateral, creationRequest.base.collateralAmounts[i] / 2);
214213
collateralDecimals = _collateralDecimals;
215-
paymentAmount +=
216-
(2 * _cost) - IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(_cost);
214+
paymentAmount += (2 * _cost)
215+
- IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(_cost);
217216
}
218217
} else {
219218
for (uint256 i = 0; i < creationRequest.base.originationPools.length; i++) {
@@ -356,9 +355,13 @@ contract Router is
356355
* @param oPoolConfigId The OPoolConfigId of the origination pool config
357356
* @return originationPool The origination pool
358357
*/
359-
function _getOrCreateOriginationPool(OPoolConfigId oPoolConfigId) internal returns (IOriginationPool originationPool) {
360-
originationPool =
361-
IOriginationPool(IOriginationPoolScheduler(originationPoolScheduler).predictOriginationPool(oPoolConfigId));
358+
function _getOrCreateOriginationPool(OPoolConfigId oPoolConfigId)
359+
internal
360+
returns (IOriginationPool originationPool)
361+
{
362+
originationPool = IOriginationPool(
363+
IOriginationPoolScheduler(originationPoolScheduler).predictOriginationPool(oPoolConfigId)
364+
);
362365
if (!IOriginationPoolScheduler(originationPoolScheduler).isRegistered(address(originationPool))) {
363366
IOriginationPool(IOriginationPoolScheduler(originationPoolScheduler).deployOriginationPool(oPoolConfigId));
364367
}

verification.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)