minor fix in the contract

Author: SatyamSB

contracts/libraries/VolumeRestrictionLib.sol

@@ -128,29 +128,21 @@ library VolumeRestrictionLib {
         counter = 0;
         for (i = 0; i < investors.length; i++) {
             if (_isVolRestricted(IDataStore(_dataStore).getUint256(_getKey(INVESTORFLAGS, investors[i])))) {
-                uint256 typeValue = (holderToRestrictionType[investors[i]] == uint8(2) ? 2 : 1);
-                if (typeValue == 2) {
-                    allAddresses[counter] = investors[i];
+                allAddresses[counter] = investors[i];
+                if (holderToRestrictionType[investors[i]] == uint8(VolumeRestrictionTMStorage.TypeOfPeriod.MultipleDays)) {
+                    _setValues(_individualRestrictions.individualRestriction[investors[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
+                } 
+                else if (holderToRestrictionType[investors[i]] == uint8(VolumeRestrictionTMStorage.TypeOfPeriod.OneDay)) {
+                    _setValues(_individualRestrictions.individualDailyRestriction[investors[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
+                } 
+                else if (holderToRestrictionType[investors[i]] == uint8(VolumeRestrictionTMStorage.TypeOfPeriod.Both)) {
+                    _setValues(_individualRestrictions.individualRestriction[investors[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
                     counter++;
+                    allAddresses[counter] = investors[i];
+                    _setValues(_individualRestrictions.individualDailyRestriction[investors[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
                 }
-                allAddresses[counter] = investors[i];
-                counter++;
-            }
-        }
-        counter = 0;
-        for (i = 0; i < allAddresses.length; i++) {
-            if (holderToRestrictionType[allAddresses[i]] == uint8(VolumeRestrictionTMStorage.TypeOfPeriod.MultipleDays)) {
-                _setValues(_individualRestrictions.individualRestriction[allAddresses[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
-            } 
-            else if (holderToRestrictionType[allAddresses[i]] == uint8(VolumeRestrictionTMStorage.TypeOfPeriod.OneDay)) {
-                _setValues(_individualRestrictions.individualDailyRestriction[allAddresses[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
-            } 
-            else if (holderToRestrictionType[allAddresses[i]] == uint8(VolumeRestrictionTMStorage.TypeOfPeriod.Both)) {
-                _setValues(_individualRestrictions.individualRestriction[allAddresses[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
                 counter++;
-                _setValues(_individualRestrictions.individualDailyRestriction[allAddresses[i]], allowedTokens, startTime, rollingPeriodInDays, endTime, typeOfRestriction, counter);
             }
-            counter++;
         }
     }
 

contracts/modules/TransferManager/VolumeRestrictionTM.sol

@@ -304,7 +304,7 @@ contract VolumeRestrictionTM is VolumeRestrictionTMStorage, TransferManager {
                 holderToRestrictionType,
                 _holder,
                 uint8(TypeOfPeriod.OneDay),
-                individualRestrictions.individualDailyRestriction[_holder].endTime,
+                individualRestrictions.individualRestriction[_holder].endTime,
                 getDataStore()
             );
         emit AddIndividualDailyRestriction(
@@ -314,7 +314,7 @@ contract VolumeRestrictionTM is VolumeRestrictionTMStorage, TransferManager {
             1,
             _endTime,
             _restrictionType
-      );
+        );
     }
 
     /**

test/y_volume_restriction_tm.js

@@ -791,14 +791,11 @@ contract('VolumeRestrictionTransferManager', accounts => {
             assert.equal(tx.logs[0].args._holder, account_investor3);
             assert.equal(tx.logs[0].args._typeOfRestriction, 0);
             assert.equal((tx.logs[0].args._allowedTokens).toString(), new BN(web3.utils.toWei("6")));
-            console.log("HELLO HOW DO you DO");
             let data = await I_VolumeRestrictionTM.getRestrictionData.call();
             await printRestrictedData(data);
-            console.log("HELLO HOW DO you DO12");
             assert.equal(data[0].length, 2);
             assert.equal(data[0][1], account_investor3);
             let dataRestriction = await I_VolumeRestrictionTM.getIndividualDailyRestriction.call(account_investor3);
-            console.log("HELLO HOW DO you DO123");
             console.log(`
                 *** Individual Daily restriction data ***
                 Allowed Tokens:          ${dataRestriction[0].div(new BN(10).pow(new BN(18))).toString()}