[Update]: Improve coverage

.openzeppelin/unknown-17000.json

@@ -939,115 +939,6 @@
         },
         "namespaces": {}
       }
-    },
-    "cace716c99b7c3331ef14bea41153e9b79ee38508d038ed764ebfa2f3addf8d6": {
-      "address": "0xEFccE07BeC6418e32e72a28aFf0cdf442AEc14ea",
-      "txHash": "0x3da46b8992ed89a293c740d4e6a724eb0f24fc7b8fd2257bcd8af434ca1f956c",
-      "layout": {
-        "solcVersion": "0.8.18",
-        "storage": [
-          {
-            "label": "_initialized",
-            "offset": 0,
-            "slot": "0",
-            "type": "t_uint8",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
-            "retypedFrom": "bool"
-          },
-          {
-            "label": "_initializing",
-            "offset": 1,
-            "slot": "0",
-            "type": "t_bool",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "1",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "ERC1967UpgradeUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "51",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "UUPSUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "101",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "ContextUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
-          },
-          {
-            "label": "_owner",
-            "offset": 0,
-            "slot": "151",
-            "type": "t_address",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "152",
-            "type": "t_array(t_uint256)49_storage",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
-          },
-          {
-            "label": "_pendingOwner",
-            "offset": 0,
-            "slot": "201",
-            "type": "t_address",
-            "contract": "Ownable2StepUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:27"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "202",
-            "type": "t_array(t_uint256)49_storage",
-            "contract": "Ownable2StepUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:70"
-          }
-        ],
-        "types": {
-          "t_address": {
-            "label": "address",
-            "numberOfBytes": "20"
-          },
-          "t_array(t_uint256)49_storage": {
-            "label": "uint256[49]",
-            "numberOfBytes": "1568"
-          },
-          "t_array(t_uint256)50_storage": {
-            "label": "uint256[50]",
-            "numberOfBytes": "1600"
-          },
-          "t_bool": {
-            "label": "bool",
-            "numberOfBytes": "1"
-          },
-          "t_uint256": {
-            "label": "uint256",
-            "numberOfBytes": "32"
-          },
-          "t_uint8": {
-            "label": "uint8",
-            "numberOfBytes": "1"
-          }
-        },
-        "namespaces": {}
-      }
     }
   }
 }

.solcover.js

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const path = require('path');
+
+module.exports = {
+  coverageContractDepth: 10,
+  gasLimit: 10000000,
+  skipFiles: getSkipFiles(['deprecated', 'test', 'upgrades']),
+};
+
+function getSkipFiles(folders) {
+  const skipFiles = [];
+  const contractsPath = __dirname + '/contracts/';
+  folders.forEach(folderName => {
+    const testFolderPath = path.join(contractsPath, folderName);
+    function readFilesRecursively(folderPath) {
+      const files = fs.readdirSync(folderPath);
+      files.forEach(file => {
+        const filePath = path.join(folderPath, file);
+        const stats = fs.statSync(filePath);
+        if (stats.isDirectory()) {
+          readFilesRecursively(filePath);
+        } else if (stats.isFile() && path.extname(filePath) === '.sol') {
+          skipFiles.push(filePath.replace(contractsPath, ''));
+        }
+      });
+    }
+    readFilesRecursively(testFolderPath);
+  });
+
+  return skipFiles;
+}

test/helpers/contract-helpers.ts

@@ -50,7 +50,7 @@ export const DataGenerator = {
     if (validators.length > 0) {
       return validators[0].publicKey;
     }
-    return `0x${id.toString(16).padStart(48, '0')}`;
+    return `0x${id.toString(16).padStart(96, '0')}`;
   },
   shares: async (ownerId: number, validatorId: number, operatorCount: number) => {
     let shared: any;
@@ -107,7 +107,7 @@ export const getClusterForValidator = (
   return { validatorCount, networkFeeIndex, index, balance, active };
 };
 
-export const initializeContract = async () => {
+export const initializeContract = async (validatorsPerOperatorLimit = 500) => {
   CONFIG = {
     initialVersion: 'v1.1.0',
     operatorMaxFeeIncrease: 1000,
@@ -116,7 +116,7 @@ export const initializeContract = async () => {
     minimalOperatorFee: 100000000,
     minimalBlocksBeforeLiquidation: 100800,
     minimumLiquidationCollateral: 200000000,
-    validatorsPerOperatorLimit: 500,
+    validatorsPerOperatorLimit: validatorsPerOperatorLimit,
     maximumOperatorFee: 76528650000000,
   };