Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: minor simiplification in _withdraw amountToWithdraw computation

Browse Source
This commit is contained in:
Lasse Herskind 2021-08-23 16:51:43 +02:00
parent 2ac390b8fd
commit 7b20dee0fa
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/protocol/tokenization/StaticATokenLM.sol
View File

@ -395,9 +395,7 @@ contract StaticATokenLM is ERC20 {
uint256 currentRate = rate(); uint256 currentRate = rate();
if (staticAmount > 0) { if (staticAmount > 0) {
amountToBurn = (staticAmount > userBalance) ? userBalance : staticAmount; amountToBurn = (staticAmount > userBalance) ? userBalance : staticAmount;
amountToWithdraw = (staticAmount > userBalance) amountToWithdraw = _staticToDynamicAmount(amountToBurn, currentRate);
? _staticToDynamicAmount(userBalance, currentRate)
: _staticToDynamicAmount(staticAmount, currentRate);
} else { } else {
uint256 dynamicUserBalance = _staticToDynamicAmount(userBalance, currentRate); uint256 dynamicUserBalance = _staticToDynamicAmount(userBalance, currentRate);
amountToWithdraw = (dynamicAmount > dynamicUserBalance) ? dynamicUserBalance : dynamicAmount; amountToWithdraw = (dynamicAmount > dynamicUserBalance) ? dynamicUserBalance : dynamicAmount;

2
test-suites/test-aave/mainnet/static-atoken-lm/static-atoken-liquidity-mining-rewards.spec.ts
View File

@ -280,7 +280,7 @@ describe('StaticATokenLM: aToken wrapper with static balances and liquidity mini
const bGas = BigNumber.from(bReceipt['gasUsed']); const bGas = BigNumber.from(bReceipt['gasUsed']);
expect(aGas).to.be.gt(350000); expect(aGas).to.be.gt(350000);
expect(bGas).to.be.lt(25000); expect(bGas).to.be.lt(100000);
await DRE.network.provider.send('evm_setAutomine', [true]); await DRE.network.provider.send('evm_setAutomine', [true]);
}); });