Merge pull request #724 from lidofinance/feat/remove-burn-and-force-exit

Feat: remove shares burn and remove force exit predicate

Author: F4ever

src/modules/accounting/accounting.py

@@ -302,8 +302,9 @@ def simulate_rebase_after_report(
         )
 
     def get_shares_to_burn(self, blockstamp: ReferenceBlockStamp) -> int:
-        shares_data = self.w3.lido_contracts.burner.get_shares_requested_to_burn(blockstamp.block_hash)
-        return shares_data.cover_shares + shares_data.non_cover_shares
+        # shares_data = self.w3.lido_contracts.burner.get_shares_requested_to_burn(blockstamp.block_hash)
+        # return shares_data.cover_shares + shares_data.non_cover_shares
+        return 0
 
     def _get_slots_elapsed_from_last_report(self, blockstamp: ReferenceBlockStamp):
         chain_conf = self.get_chain_config(blockstamp)

src/services/exit_order_iterator.py

@@ -270,10 +270,11 @@ def _no_predicate(self, node_operator: NodeOperatorStats) -> tuple:
 
     @staticmethod
     def _no_force_predicate(node_operator: NodeOperatorStats) -> int:
-        return ValidatorExitIterator._get_expected_validators_diff(
-            node_operator.predictable_validators,
-            node_operator.force_exit_to,
-        )
+        # return ValidatorExitIterator._get_expected_validators_diff(
+        #     node_operator.predictable_validators,
+        #     node_operator.force_exit_to,
+        # )
+        return 0
 
     @staticmethod
     def _no_soft_predicate(node_operator: NodeOperatorStats) -> int:

tests/modules/accounting/test_accounting_module.py

@@ -416,9 +416,9 @@ def test_get_shares_to_burn(
     out = accounting.get_shares_to_burn(bs)
 
     assert (
-        out == shares_data.cover_shares + shares_data.non_cover_shares
+        out == 0  # shares_data.cover_shares + shares_data.non_cover_shares
     ), "get_shares_to_burn returned unexpected value"
-    call_mock.assert_called_once()
+    # call_mock.assert_called_once()
 
 
 @pytest.mark.unit

tests/modules/ejector/test_validator_exit_order_iterator.py

@@ -194,9 +194,9 @@ def test_eject_validator(iterator):
 
     force_list = ejector.get_remaining_forced_validators()
 
-    assert len(force_list) == 2
-    assert force_list[0][0] == (1, 1)
-    assert force_list[1][0] == (1, 1)
+    assert len(force_list) == 0
+    # assert force_list[0][0] == (1, 1)
+    # assert force_list[1][0] == (1, 1)
 
 
 @pytest.mark.unit
@@ -227,7 +227,8 @@ def test_no_predicate(iterator):
 
     result = iterator._no_predicate(node_operator_1)
 
-    assert result == (1, -50, -75, -185, 0, -100, 10)
+    assert result == (1, 0, -75, -185, 0, -100, 10)
+    # assert result == (1, -50, -75, -185, 0, -100, 10)
 
     node_operator_2 = NodeOperatorStatsFactory.build(
         predictable_validators=2000,
@@ -244,23 +245,27 @@ def test_no_predicate(iterator):
     )
 
     result = iterator._no_predicate(node_operator_2)
-    assert result == (0, -1950, -1975, -185, -1000, -2000, 20)
+    assert result == (0, 0, -1975, -185, -1000, -2000, 20)
+    # assert result == (0, -1950, -1975, -185, -1000, -2000, 20)
 
     iterator.consensus_version = 3
     iterator.w3.cc.is_electra_activated = Mock(return_value=False)
 
     # Check works with old alg before pectra
     result = iterator._no_predicate(node_operator_2)
-    assert result == (0, -1950, -1975, -185, -1000, -2000, 20)
+    assert result == (0, 0, -1975, -185, -1000, -2000, 20)
+    # assert result == (0, -1950, -1975, -185, -1000, -2000, 20)
 
     iterator.w3.cc.is_electra_activated = Mock(return_value=True)
 
     # Check after pectra
     result = iterator._no_predicate(node_operator_2)
-    assert result == (0, -1950, -1975, -185, 0, -2000, 20)
+    assert result == (0, 0, -1975, -185, 0, -2000, 20)
+    # assert result == (0, -1950, -1975, -185, 0, -2000, 20)
 
     result = iterator._no_predicate(node_operator_1)
-    assert result == (1, -50, -75, -185, -1000, -100, 10)
+    assert result == (1, 0, -75, -185, -1000, -100, 10)
+    # assert result == (1, -50, -75, -185, -1000, -100, 10)
 
 
 @pytest.mark.unit
@@ -273,17 +278,17 @@ def test_no_force_and_soft_predicate(iterator):
     ]
 
     # Priority to bigger diff exitable - forced_to
-    sorted_nos = sorted(nos, key=lambda x: -iterator._no_force_predicate(x))
+    # sorted_nos = sorted(nos, key=lambda x: -iterator._no_force_predicate(x))
 
-    assert [nos[0], nos[3], nos[1], nos[2]] == sorted_nos
+    # assert [nos[0], nos[3], nos[1], nos[2]] == sorted_nos
 
     # Last two elements have same weight
-    assert [
-        nos[0].node_operator.id,
-        nos[3].node_operator.id,
-    ] == [
-        no.node_operator.id for no in sorted_nos
-    ][:2]
+    # assert [
+    #     nos[0].node_operator.id,
+    #     nos[3].node_operator.id,
+    # ] == [
+    #     no.node_operator.id for no in sorted_nos
+    # ][:2]
 
     sorted_nos = sorted(nos, key=lambda x: -iterator._no_soft_predicate(x))
     assert [
@@ -419,19 +424,20 @@ def _eject(self, gid):
 
     vals = iterator.get_remaining_forced_validators()
 
-    assert len(vals) == 3
+    assert len(vals) == 0
+    # assert len(vals) == 3
 
-    assert vals[0][1].index == 3
-    assert vals[1][1].index == 4
-    assert vals[2][1].index == 5
+    # assert vals[0][1].index == 3
+    # assert vals[1][1].index == 4
+    # assert vals[2][1].index == 5
 
     iterator.node_operators_stats[1, 2].predictable_validators = 11
-
     iterator.max_validators_to_exit = 10
     iterator.index = 9
 
     vals = iterator.get_remaining_forced_validators()
-    assert len(vals) == 1
+    assert len(vals) == 0
+    # assert len(vals) == 1
 
 
 @pytest.mark.unit