Only emit TokenRemoved event when a token is actually removed

pie-dao · Dec 7, 2020 · d7eb866 · d7eb866
1 parent edeee96
commit d7eb866
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/contracts/facets/Basket/BasketFacet.sol b/contracts/facets/Basket/BasketFacet.sol
@@ -43,16 +43,14 @@ contract BasketFacet is ReentryProtection, CallProtection, IBasketFacet {
         bs.inPool[_token] = false;
 
         // remove token from array
-        // TODO consider limiting max amount of tokens to mitigate running out of gas.
         for(uint256 i; i < bs.tokens.length; i ++) {
             if(address(bs.tokens[i]) == _token) {
                 bs.tokens[i] = bs.tokens[bs.tokens.length - 1];
                 bs.tokens.pop();
+                emit TokenRemoved(_token);
                 break;
             }
         }
-
-        emit TokenRemoved(_token);
     }
 
     function setEntryFee(uint256 _fee) external override protectedCall {