minor fixes

Author: SatyamSB

contracts/datastore/DataStore.sol

@@ -28,7 +28,7 @@ contract DataStore is DataStoreStorage, IDataStore {
         _;
     }
 
-    modifier validInputLength(uint256 _keyLength, uint256 _dataLength) {
+    modifier validArrayLength(uint256 _keyLength, uint256 _dataLength) {
         require(_keyLength == _dataLength, "Array length mismatch");
         _;
     }
@@ -147,25 +147,25 @@ contract DataStore is DataStoreStorage, IDataStore {
      * @param _keys Array of keys to identify the data
      * @param _data Array of data to be stored against the respective keys
      */
-    function setUint256Multi(bytes32[] calldata _keys, uint256[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function setUint256Multi(bytes32[] calldata _keys, uint256[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _setData(_keys[i], _data[i]);
         }
     }
 
-    function setBytes32Multi(bytes32[] calldata _keys, bytes32[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function setBytes32Multi(bytes32[] calldata _keys, bytes32[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _setData(_keys[i], _data[i]);
         }
     }
 
-    function setAddressMulti(bytes32[] calldata _keys, address[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function setAddressMulti(bytes32[] calldata _keys, address[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _setData(_keys[i], _data[i]);
         }
     }
 
-    function setBoolMulti(bytes32[] calldata _keys, bool[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function setBoolMulti(bytes32[] calldata _keys, bool[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _setData(_keys[i], _data[i]);
         }
@@ -176,25 +176,25 @@ contract DataStore is DataStoreStorage, IDataStore {
      * @param _keys Array of keys to identify the data
      * @param _data Array of data to be inserted in arrays of the respective keys
      */
-    function insertUint256Multi(bytes32[] calldata _keys, uint256[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function insertUint256Multi(bytes32[] calldata _keys, uint256[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _insertData(_keys[i], _data[i]);
         }
     }
 
-    function insertBytes32Multi(bytes32[] calldata _keys, bytes32[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function insertBytes32Multi(bytes32[] calldata _keys, bytes32[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _insertData(_keys[i], _data[i]);
         }
     }
 
-    function insertAddressMulti(bytes32[] calldata _keys, address[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function insertAddressMulti(bytes32[] calldata _keys, address[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _insertData(_keys[i], _data[i]);
         }
     }
 
-    function insertBoolMulti(bytes32[] calldata _keys, bool[] calldata _data) external onlyAuthorized validInputLength(_keys.length, _data.length) {
+    function insertBoolMulti(bytes32[] calldata _keys, bool[] calldata _data) external onlyAuthorized validArrayLength(_keys.length, _data.length) {
         for (uint256 i = 0; i < _keys.length; i++) {
             _insertData(_keys[i], _data[i]);
         }

contracts/modules/Experimental/TransferManager/KYCTransferManager.sol

@@ -40,11 +40,8 @@ contract KYCTransferManager is TransferManager {
         public 
         returns (Result) 
     {
-        if (!paused) {
-            bytes32 key = _getKYCKey(_to);
-            IDataStore dataStore = IDataStore(ISecurityToken(securityToken).dataStore());
-            if (dataStore.getUint256(key) > 0)
-                return Result.VALID;
+        if (!paused && checkKYC(_to)) {
+            return Result.VALID;
         }
         return Result.NA;
     }