From 1e234738c435c22a7fa16dd16af5de73411b2a07 Mon Sep 17 00:00:00 2001 From: Brendan Asselstine Date: Mon, 6 Jun 2022 11:35:22 -0700 Subject: [PATCH] Fixed up some param names --- contracts/PrizePoolLiquidator.sol | 22 +++++++++++----------- contracts/libraries/LiquidatorLib.sol | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/contracts/PrizePoolLiquidator.sol b/contracts/PrizePoolLiquidator.sol index c49f3b9f..c307bad5 100644 --- a/contracts/PrizePoolLiquidator.sol +++ b/contracts/PrizePoolLiquidator.sol @@ -34,21 +34,21 @@ contract PrizePoolLiquidator { IPrizePoolLiquidatorListener public listener; function setPrizePool( - IPrizePool pool, - address target, - IERC20 want, + IPrizePool _pool, + address _target, + IERC20 _want, uint32 _swapMultiplier, uint32 _liquidityFraction, uint192 _reserveA, uint192 _reserveB ) external returns (bool) { - poolLiquidatorConfigs[pool] = LiquidatorConfig({ - target: target, - want: want, + poolLiquidatorConfigs[_pool] = LiquidatorConfig({ + target: _target, + want: _want, swapMultiplier: _swapMultiplier, liquidityFraction: _liquidityFraction }); - poolLiquidatorStates[pool] = LiquidatorState({ + poolLiquidatorStates[_pool] = LiquidatorState({ reserveA: _reserveA, reserveB: _reserveB }); @@ -73,19 +73,19 @@ contract PrizePoolLiquidator { return (reserveA*1e18) / reserveB; } - function computeExactAmountIn(IPrizePool _prizePool, uint256 amountOut) external returns (uint256) { + function computeExactAmountIn(IPrizePool _prizePool, uint256 _amountOut) external returns (uint256) { LiquidatorConfig memory config = poolLiquidatorConfigs[_prizePool]; LiquidatorState memory state = poolLiquidatorStates[_prizePool]; return LiquidatorLib.computeExactAmountIn( - state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), amountOut, config.swapMultiplier, config.liquidityFraction + state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), _amountOut, config.swapMultiplier, config.liquidityFraction ); } - function computeExactAmountOut(IPrizePool _prizePool, uint256 amountIn) external returns (uint256) { + function computeExactAmountOut(IPrizePool _prizePool, uint256 _amountIn) external returns (uint256) { LiquidatorConfig memory config = poolLiquidatorConfigs[_prizePool]; LiquidatorState memory state = poolLiquidatorStates[_prizePool]; return LiquidatorLib.computeExactAmountOut( - state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), amountIn, config.swapMultiplier, config.liquidityFraction + state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), _amountIn, config.swapMultiplier, config.liquidityFraction ); } diff --git a/contracts/libraries/LiquidatorLib.sol b/contracts/libraries/LiquidatorLib.sol index de4623be..a6505ab5 100644 --- a/contracts/libraries/LiquidatorLib.sol +++ b/contracts/libraries/LiquidatorLib.sol @@ -44,13 +44,13 @@ library LiquidatorLib { function prepareSwap( uint256 _reserveA, uint256 _reserveB, - uint256 availableBalance + uint256 _availableBalance ) internal pure returns (uint256 reserveA, uint256 reserveB) { // swap back yield - uint256 wantAmount = CpmmLib.getAmountOut(availableBalance, _reserveA, _reserveB); + uint256 wantAmount = CpmmLib.getAmountOut(_availableBalance, _reserveA, _reserveB); reserveB = _reserveB.sub(wantAmount); - reserveA = _reserveA.add(availableBalance); + reserveA = _reserveA.add(_availableBalance); } function _finishSwap( @@ -77,22 +77,22 @@ library LiquidatorLib { function swapExactAmountIn( uint256 _reserveA, uint256 _reserveB, - uint256 availableBalance, - uint256 amountIn, + uint256 _availableBalance, + uint256 _amountIn, uint32 _swapMultiplier, uint32 _liquidityFraction ) internal view returns (uint256 reserveA, uint256 reserveB, uint256 amountOut) { - require(availableBalance > 0, "Whoops! no funds available"); + require(_availableBalance > 0, "Whoops! no funds available"); - (reserveA, reserveB) = prepareSwap(_reserveA, _reserveB, availableBalance); + (reserveA, reserveB) = prepareSwap(_reserveA, _reserveB, _availableBalance); // do swap - amountOut = CpmmLib.getAmountOut(amountIn, reserveB, reserveA); - require(amountOut <= availableBalance, "Whoops! have exceeds available"); - reserveB = reserveB.add(amountIn); + amountOut = CpmmLib.getAmountOut(_amountIn, reserveB, reserveA); + require(amountOut <= _availableBalance, "Whoops! have exceeds available"); + reserveB = reserveB.add(_amountIn); reserveA = reserveA.sub(amountOut); - (reserveA, reserveB) = _finishSwap(reserveA, reserveB, availableBalance, amountOut, _swapMultiplier, _liquidityFraction); + (reserveA, reserveB) = _finishSwap(reserveA, reserveB, _availableBalance, amountOut, _swapMultiplier, _liquidityFraction); } function swapExactAmountOut(