Skip to content

Commit f977944

Browse files
committed
fmt: running forge-fmt b/c of foundry updates
1 parent d48fb9d commit f977944

2 files changed

Lines changed: 12 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
@@ -201,14 +201,13 @@ contract Router is
201201
if (creationRequest.base.isCompounding) {
202202
for (uint256 i = 0; i < creationRequest.base.originationPools.length; i++) {
203203
// If compounding, need to collect 1/2 of the collateral amount + commission fee (this is in the form of collateral)
204-
collateralCollected += IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(
205-
(creationRequest.base.collateralAmounts[i] + 1) / 2
206-
);
204+
collateralCollected += IOriginationPool(creationRequest.base.originationPools[i])
205+
.calculateReturnAmount((creationRequest.base.collateralAmounts[i] + 1) / 2);
207206
(uint256 _cost, uint8 _collateralDecimals) =
208207
_calculateCost(creationRequest.collateral, creationRequest.base.collateralAmounts[i] / 2);
209208
collateralDecimals = _collateralDecimals;
210-
paymentAmount +=
211-
(2 * _cost) - IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(_cost);
209+
paymentAmount += (2 * _cost)
210+
- IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(_cost);
212211
}
213212
} else {
214213
for (uint256 i = 0; i < creationRequest.base.originationPools.length; i++) {
@@ -351,9 +350,13 @@ contract Router is
351350
* @param oPoolConfigId The OPoolConfigId of the origination pool config
352351
* @return originationPool The origination pool
353352
*/
354-
function _getOrCreateOriginationPool(OPoolConfigId oPoolConfigId) internal returns (IOriginationPool originationPool) {
355-
originationPool =
356-
IOriginationPool(IOriginationPoolScheduler(originationPoolScheduler).predictOriginationPool(oPoolConfigId));
353+
function _getOrCreateOriginationPool(OPoolConfigId oPoolConfigId)
354+
internal
355+
returns (IOriginationPool originationPool)
356+
{
357+
originationPool = IOriginationPool(
358+
IOriginationPoolScheduler(originationPoolScheduler).predictOriginationPool(oPoolConfigId)
359+
);
357360
if (!IOriginationPoolScheduler(originationPoolScheduler).isRegistered(address(originationPool))) {
358361
IOriginationPool(IOriginationPoolScheduler(originationPoolScheduler).deployOriginationPool(oPoolConfigId));
359362
}

0 commit comments

Comments
 (0)