From 7b20dee0fa47e35dda9186d05ffbe4c7d05c5b32 Mon Sep 17 00:00:00 2001
From: Lasse Herskind <16536249+LHerskind@users.noreply.github.com>
Date: Mon, 23 Aug 2021 16:51:43 +0200
Subject: [PATCH] fix: minor simiplification in `_withdraw` `amountToWithdraw`
 computation

---
 contracts/protocol/tokenization/StaticATokenLM.sol            | 4 +---
 .../static-atoken-liquidity-mining-rewards.spec.ts            | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/contracts/protocol/tokenization/StaticATokenLM.sol b/contracts/protocol/tokenization/StaticATokenLM.sol
index 9b83b587..0fc474e6 100644
--- a/contracts/protocol/tokenization/StaticATokenLM.sol
+++ b/contracts/protocol/tokenization/StaticATokenLM.sol
@@ -395,9 +395,7 @@ contract StaticATokenLM is ERC20 {
     uint256 currentRate = rate();
     if (staticAmount > 0) {
       amountToBurn = (staticAmount > userBalance) ? userBalance : staticAmount;
-      amountToWithdraw = (staticAmount > userBalance)
-        ? _staticToDynamicAmount(userBalance, currentRate)
-        : _staticToDynamicAmount(staticAmount, currentRate);
+      amountToWithdraw = _staticToDynamicAmount(amountToBurn, currentRate);
     } else {
       uint256 dynamicUserBalance = _staticToDynamicAmount(userBalance, currentRate);
       amountToWithdraw = (dynamicAmount > dynamicUserBalance) ? dynamicUserBalance : dynamicAmount;
diff --git a/test-suites/test-aave/mainnet/static-atoken-lm/static-atoken-liquidity-mining-rewards.spec.ts b/test-suites/test-aave/mainnet/static-atoken-lm/static-atoken-liquidity-mining-rewards.spec.ts
index f0350c98..67979f28 100644
--- a/test-suites/test-aave/mainnet/static-atoken-lm/static-atoken-liquidity-mining-rewards.spec.ts
+++ b/test-suites/test-aave/mainnet/static-atoken-lm/static-atoken-liquidity-mining-rewards.spec.ts
@@ -280,7 +280,7 @@ describe('StaticATokenLM: aToken wrapper with static balances and liquidity mini
       const bGas = BigNumber.from(bReceipt['gasUsed']);
 
       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]);
     });