Small optimisation

Author: adamdossa

contracts/modules/TransferManager/VolumeRestrictionTM.sol

@@ -112,7 +112,7 @@ contract VolumeRestrictionTM is VolumeRestrictionTMStorage, ITransferManager {
      */
     function verifyTransfer(address _from, address /*_to */, uint256 _amount, bytes /*_data*/, bool _isTransfer) public returns (Result) {
         // If `_from` is present in the exemptionList or it is `0x0` address then it will not follow the vol restriction
-        if (!paused && _from != address(0) && !exemptList[_from]) {
+        if (!paused && _from != address(0) && exemptIndex[_from] == 0) {
             // Function must only be called by the associated security token if _isTransfer == true
             require(msg.sender == securityToken || !_isTransfer);
             // Checking the individual restriction if the `_from` comes in the individual category
@@ -137,15 +137,14 @@ contract VolumeRestrictionTM is VolumeRestrictionTMStorage, ITransferManager {
      */
     function changeExemptWalletList(address _wallet, bool _change) public withPerm(ADMIN) {
         require(_wallet != address(0));
-        require(exemptList[_wallet] != _change);
+        require((exemptIndex[_wallet] == 0) == _change);
         if (_change) {
             exemptAddresses.push(_wallet);
             exemptIndex[_wallet] = exemptAddresses.length;
-            exemptList[_wallet] = true;
         } else {
-            exemptAddresses[exemptIndex[_wallet] - 1] = exemptAddresses[exemptAddresses.length -1];
-            exemptIndex[exemptAddresses[exemptIndex[_wallet] -1 ]] = exemptIndex[_wallet];
-            delete exemptList[_wallet];
+            exemptAddresses[exemptIndex[_wallet] - 1] = exemptAddresses[exemptAddresses.length - 1];
+            exemptIndex[exemptAddresses[exemptIndex[_wallet] - 1]] = exemptIndex[_wallet];
+            delete exemptIndex[_wallet];
             exemptAddresses.length --;
         }
         emit ChangedExemptWalletList(_wallet, _change);
@@ -200,7 +199,7 @@ contract VolumeRestrictionTM is VolumeRestrictionTMStorage, ITransferManager {
             individualRestriction[_holder].endTime < now,
             "Not Allowed"
         );
-        require(_holder != address(0) && !exemptList[_holder], "Invalid address");
+        require(_holder != address(0) && exemptIndex[_holder] == 0, "Invalid address");
         _checkInputParams(_allowedTokens, _startTime, _rollingPeriodInDays, _endTime, _restrictionType, now);
 
         if (individualRestriction[_holder].endTime != 0) {
@@ -1129,15 +1128,15 @@ contract VolumeRestrictionTM is VolumeRestrictionTMStorage, ITransferManager {
     function getExemptAddress() external view returns(address[]) {
         return exemptAddresses;
     }
-    
+
     /**
      * @notice Provide the restriction details of all the restricted addresses
      * @return address List of the restricted addresses
      * @return uint256 List of the tokens allowed to the restricted addresses corresponds to restricted address
      * @return uint256 List of the start time of the restriction corresponds to restricted address
      * @return uint256 List of the rolling period in days for a restriction corresponds to restricted address.
      * @return uint256 List of the end time of the restriction corresponds to restricted address.
-     * @return uint8 List of the type of restriction to validate the value of the `allowedTokens` 
+     * @return uint8 List of the type of restriction to validate the value of the `allowedTokens`
      * of the restriction corresponds to restricted address
      */
     function getRestrictedData() external view returns(
@@ -1186,7 +1185,7 @@ contract VolumeRestrictionTM is VolumeRestrictionTMStorage, ITransferManager {
         uint256[] memory endTime,
         uint8[] memory typeOfRestriction,
         uint256 index
-    ) 
+    )
         internal
         pure
     {

contracts/modules/TransferManager/VolumeRestrictionTMStorage.sol

@@ -13,7 +13,7 @@ contract VolumeRestrictionTMStorage {
 
     struct VolumeRestriction {
         // If typeOfRestriction is `Percentage` then allowedTokens will be in
-        // the % (w.r.t to totalSupply) with a multiplier of 10**16 . else it 
+        // the % (w.r.t to totalSupply) with a multiplier of 10**16 . else it
         // will be fixed amount of tokens
         uint256 allowedTokens;
         uint256 startTime;
@@ -24,7 +24,7 @@ contract VolumeRestrictionTMStorage {
 
     struct BucketDetails {
         uint256 lastTradedDayTime;
-        uint256 sumOfLastPeriod;   // It is the sum of transacted amount within the last rollingPeriodDays 
+        uint256 sumOfLastPeriod;   // It is the sum of transacted amount within the last rollingPeriodDays
         uint256 daysCovered;    // No of days covered till (from the startTime of VolumeRestriction)
         uint256 dailyLastTradedDayTime;
     }
@@ -44,11 +44,11 @@ contract VolumeRestrictionTMStorage {
     // Storing the information related to default restriction
     mapping(address => BucketDetails) internal defaultUserToBucket;
     // List of wallets that are exempted from all the restrictions applied by the this contract
-    mapping(address => bool) public exemptList;
+    /* mapping(address => bool) public exemptList; */
     // Restricted data (refernce from the VolumeRestrictionLib library )
     VolumeRestrictionLib.RestrictedData holderData;
     // Holde exempt index
     mapping(address => uint256) exemptIndex;
     address[] public exemptAddresses;
-    
-}
+
+}