Merge pull request #117 from skalenetwork/bugfix/Fix-deleteMonitor

Bugfix/fix delete monitor
skalenetwork · Mar 11, 2020 · abb4a48 · abb4a48
2 parents 7f9eefa + 3fdc993
commit abb4a48
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 1 deletion.
diff --git a/contracts/MonitorsData.sol b/contracts/MonitorsData.sol
@@ -81,6 +81,10 @@ contract MonitorsData is GroupsData {
         return checkedNodes[monitorIndex];
     }
 
+    function getCheckedArrayLength(bytes32 monitorIndex) external view returns (uint) {
+        return checkedNodes[monitorIndex].length;
+    }
+
     function getLengthOfMetrics(bytes32 monitorIndex) external view returns (uint) {
         return verdicts[monitorIndex].length;
     }

diff --git a/contracts/MonitorsFunctionality.sol b/contracts/MonitorsFunctionality.sol
@@ -126,7 +126,9 @@ contract MonitorsFunctionality is GroupsFunctionality {
         for (uint i = 0; i < nodesInGroup.length; i++) {
             monitorIndex = keccak256(abi.encodePacked(nodesInGroup[i]));
             (index, ) = find(monitorIndex, nodeIndex);
-            data.removeCheckedNode(monitorIndex, index);
+            if (index < data.getCheckedArrayLength(monitorIndex)) {
+                data.removeCheckedNode(monitorIndex, index);
+            }
         }
         deleteGroup(groupIndex);
     }
@@ -266,6 +268,7 @@ contract MonitorsFunctionality is GroupsFunctionality {
         bytes32[] memory checkedNodes = data.getCheckedArray(monitorIndex);
         uint possibleIndex;
         uint32 possibleTime;
+        index = checkedNodes.length;
         for (uint i = 0; i < checkedNodes.length; i++) {
             (possibleIndex, possibleTime) = getDataFromBytes(checkedNodes[i]);
             if (possibleIndex == nodeIndex && (time == 0 || possibleTime < time)) {

diff --git a/test/MonitorsFunctionality.spec.ts b/test/MonitorsFunctionality.spec.ts
@@ -241,6 +241,42 @@ contract("MonitorsFunctionality", ([owner, validator]) => {
     await monitorsData.getCheckedArray(node4Hash).should.be.eventually.empty;
   });
 
+  it("should delete nodes from checked list", async () => {
+    await monitorsFunctionality.addMonitor(0);
+    await monitorsFunctionality.addMonitor(1);
+
+    const node0Hash = web3.utils.soliditySha3(0);
+    const node1Hash = web3.utils.soliditySha3(1);
+    const node2Hash = web3.utils.soliditySha3(2);
+    const node3Hash = web3.utils.soliditySha3(3);
+    const node4Hash = web3.utils.soliditySha3(4);
+
+    (await monitorsData.getCheckedArray(node0Hash)).length.should.be.equal(1);
+    (await monitorsData.getCheckedArray(node1Hash)).length.should.be.equal(1);
+    (await monitorsData.getCheckedArray(node2Hash)).length.should.be.equal(2);
+    (await monitorsData.getCheckedArray(node3Hash)).length.should.be.equal(2);
+    (await monitorsData.getCheckedArray(node4Hash)).length.should.be.equal(2);
+
+    await monitorsFunctionality.deleteMonitor(0);
+    console.log("Finished delete 0 monitor");
+
+    await monitorsData.getCheckedArray(node0Hash).should.be.eventually.empty;
+    await monitorsData.getCheckedArray(node1Hash).should.be.eventually.empty;
+    (await monitorsData.getCheckedArray(node2Hash)).length.should.be.equal(1);
+    (await monitorsData.getCheckedArray(node3Hash)).length.should.be.equal(1);
+    (await monitorsData.getCheckedArray(node4Hash)).length.should.be.equal(1);
+
+    console.log("Started delete 1 monitor");
+    await monitorsFunctionality.deleteMonitor(1);
+    console.log("Finished delete 1 monitor");
+
+    // await monitorsData.getCheckedArray(node0Hash).should.be.eventually.empty;
+    // await monitorsData.getCheckedArray(node1Hash).should.be.eventually.empty;
+    // await monitorsData.getCheckedArray(node2Hash).should.be.eventually.empty;
+    // await monitorsData.getCheckedArray(node3Hash).should.be.eventually.empty;
+    // await monitorsData.getCheckedArray(node4Hash).should.be.eventually.empty;
+  });
+
   const nodesCount = 50;
   const activeNodesCount = 30;
   describe("when " + nodesCount + " nodes in network", async () => {