refactor: names added to mappings parameteres (#1350)

Signed-off-by: Alberto Molina <[email protected]>

Author: AlbertoMolinaIoBuilders

contracts/contracts/core/EnumerableSetBytes4.sol

@@ -7,7 +7,7 @@ library EnumerableSetBytes4 {
         bytes4[] _values;
         // Position of the value in the `values` array, plus 1 because index 0
         // means a value is not in the set.
-        mapping(bytes4 => uint256) _indexes;
+        mapping(bytes4 value => uint256 index) _indexes;
     }
 
     // Bytes4Set

contracts/contracts/core/Initializable.sol

@@ -9,7 +9,7 @@ abstract contract Initializable {
         /**
          * @dev Indicates that the contract is in the process of being initialized.
          */
-        mapping(bytes32 => bool) initialized;
+        mapping(bytes32 facetKey => bool isInitialized) initialized;
     }
 
     /**

contracts/contracts/extensions/HoldManagementStorageWrapper.sol

@@ -11,10 +11,10 @@ abstract contract HoldManagementStorageWrapper {
      */
     struct HoldDataStorage {
         int64 totalHeldAmount;
-        mapping(address => int64) totalHeldAmountByAccount;
-        mapping(address => mapping(uint256 => IHoldManagement.HoldData)) holdsByAccountAndId;
-        mapping(address => EnumerableSet.UintSet) holdIdsByAccount;
-        mapping(address => uint256) nextHoldIdByAccount;
+        mapping(address tokenHolder => int64 totalHeldAmount) totalHeldAmountByAccount;
+        mapping(address tokenHolder => mapping(uint256 holdId => IHoldManagement.HoldData holdData)) holdsByAccountAndId;
+        mapping(address tokenHolder => EnumerableSet.UintSet holdIdSet) holdIdsByAccount;
+        mapping(address tokenHolder => uint256 nextHoldId) nextHoldIdByAccount;
     }
 
     function _holdDataStorage() internal pure returns (HoldDataStorage storage holdDataStorage_) {

contracts/contracts/extensions/RolesStorageWrapper.sol

@@ -14,12 +14,12 @@ abstract contract RolesStorageWrapper {
     }
 
     struct RoleData {
-        mapping(address => MemberData) members;
+        mapping(address account => MemberData data) members;
         address[] accounts;
     }
 
     struct RolesStorage {
-        mapping(bytes32 => RoleData) roles;
+        mapping(bytes32 role => RoleData data) roles;
         /**
          * @dev Array containing all roles
          *

contracts/contracts/extensions/SupplierAdminStorageWrapper.sol

@@ -13,8 +13,8 @@ abstract contract SupplierAdminStorageWrapper is
     RolesStorageWrapper
 {
     struct SupplierAdminStorage {
-        mapping(address => uint256) supplierAllowances;
-        mapping(address => bool) unlimitedSupplierAllowances;
+        mapping(address supplier => uint256 allowance) supplierAllowances;
+        mapping(address supplier => bool hasUnlimitedAllowance) unlimitedSupplierAllowances;
     }
 
     function _getSupplierAllowance(address supplier) internal view returns (uint256) {

contracts/contracts/resolver/BusinessLogicResolverWrapper.sol

@@ -12,15 +12,11 @@ abstract contract BusinessLogicResolverWrapper is IBusinessLogicResolverWrapper
         uint256 latestVersion;
         // list of facetIds
         bytes32[] activeBusinessLogics;
-        // facetId -> bool
-        mapping(bytes32 => bool) businessLogicActive;
-        // facetId -> pos (one per vesion) -> version + status + address
-        mapping(bytes32 => IBusinessLogicResolver.BusinessLogicVersion[]) businessLogics;
-        // keccaak256(facetId, version) -> position
-        mapping(bytes32 => uint256) businessLogicVersionIndex;
-        // version to status
-        mapping(uint256 => IBusinessLogicResolver.VersionStatus) versionStatuses;
-        mapping(bytes32 => EnumerableSetBytes4.Bytes4Set) selectorBlacklist;
+        mapping(bytes32 facetId => bool isActive) businessLogicActive;
+        mapping(bytes32 facetId => IBusinessLogicResolver.BusinessLogicVersion[] versions) businessLogics;
+        mapping(bytes32 facetIdAndVersion => uint256 index) businessLogicVersionIndex;
+        mapping(uint256 version => IBusinessLogicResolver.VersionStatus status) versionStatuses;
+        mapping(bytes32 configId => EnumerableSetBytes4.Bytes4Set list) selectorBlacklist;
     }
 
     modifier validVersion(uint256 _version) {

contracts/contracts/resolver/diamondCutManager/DiamondCutManagerWrapper.sol

@@ -12,25 +12,17 @@ import {EnumerableSetBytes4} from '../../core/EnumerableSetBytes4.sol';
 abstract contract DiamondCutManagerWrapper is IDiamondCutManager, BusinessLogicResolverWrapper {
     struct DiamondCutManagerStorage {
         bytes32[] configurations;
-        mapping(bytes32 => bool) activeConfigurations;
-        mapping(bytes32 => uint256) latestVersion;
-        mapping(bytes32 => uint256) batchVersion;
-        // keccak256(configurationId, version)
-        mapping(bytes32 => bytes32[]) facetIds;
-        // keccak256(configurationId, version)
-        mapping(bytes32 => uint256[]) facetVersions;
-        // keccak256(configurationId, version, selector)
-        mapping(bytes32 => address) facetAddress;
-        // keccak256(configurationId, version, facetId)
-        mapping(bytes32 => address) addr;
-        // keccak256(configurationId, version, facetId)
-        mapping(bytes32 => bytes4[]) selectors;
-        // keccak256(configurationId, version, selector)
-        mapping(bytes32 => bytes32) selectorToFacetId;
-        // keccak256(configurationId, version, facetId)
-        mapping(bytes32 => bytes4[]) interfaceIds;
-        // keccak256(configurationId, version, interfaceId)
-        mapping(bytes32 => bool) supportsInterface;
+        mapping(bytes32 configId => bool isActive) activeConfigurations;
+        mapping(bytes32 configId => uint256 lastVersion) latestVersion;
+        mapping(bytes32 configId => uint256 pendingVersion) batchVersion;
+        mapping(bytes32 configIdAndVersion => bytes32[] facetIdList) facetIds;
+        mapping(bytes32 configIdAndVersion => uint256[] facetVersions) facetVersions;
+        mapping(bytes32 configIdAndVersionAndSelector => address facetAddress) facetAddress;
+        mapping(bytes32 configIdAndVersionAndFacetId => address facetAddress) addr;
+        mapping(bytes32 configIdAndVersionAndFacetId => bytes4[] selectorList) selectors;
+        mapping(bytes32 configIdAndVersionAndSelector => bytes32 facetId) selectorToFacetId;
+        mapping(bytes32 configIdAndVersionAndFacetId => bytes4[] interfaceList) interfaceIds;
+        mapping(bytes32 configIdAndVersionAndInterfaceId => bool isSupported) supportsInterface;
     }
 
     function _createConfiguration(