refactor: review changes

Author: 0xClandestine

src/test/integration/IntegrationBase.t.sol

@@ -540,6 +540,29 @@ abstract contract IntegrationBase is IntegrationDeployer {
         }
     }
 
+    function assert_Snap_StakerWithdrawableShares_AfterSlash(
+        User staker,
+        IAllocationManagerTypes.AllocateParams memory allocateParams,
+        IAllocationManagerTypes.SlashingParams memory slashingParams,
+        string memory err
+    ) internal {
+        uint[] memory curShares = _getWithdrawableShares(staker, allocateParams.strategies);
+        uint[] memory prevShares = _getPrevWithdrawableShares(staker, allocateParams.strategies);
+
+        for (uint i = 0; i < allocateParams.strategies.length; i++) {
+            IStrategy strat = allocateParams.strategies[i];
+
+            uint256 slashedShares = 0;
+
+            if (slashingParams.strategies.contains(strat)) {
+                uint wadToSlash = slashingParams.wadsToSlash[slashingParams.strategies.indexOf(strat)];
+                slashedShares = prevShares[i].mulWadRoundUp(allocateParams.newMagnitudes[i].mulWadRoundUp(wadToSlash));
+            }
+
+            assertApproxEqAbs(prevShares[i] - slashedShares, curShares[i], 1, err);
+        }
+    }
+
     // TODO: slashable stake
 
     /*******************************************************************************
@@ -1547,6 +1570,14 @@ abstract contract IntegrationBase is IntegrationDeployer {
         return shares;
     }
 
+    function _getPrevWithdrawableShares(User staker, IStrategy[] memory strategies) internal timewarp() returns (uint[] memory) {
+        return _getWithdrawableShares(staker, strategies);
+    }
+
+    function _getWithdrawableShares(User staker, IStrategy[] memory strategies) internal view returns (uint[] memory withdrawableShares) {
+        (withdrawableShares, ) =  delegationManager.getWithdrawableShares(address(staker), strategies);
+    }
+
     function _getActiveValidatorCount(User staker) internal view returns (uint) {
         EigenPod pod = staker.pod();
         return pod.activeValidatorCount();

src/test/integration/tests/Deposit_Delegate_Allocate.t.sol

@@ -121,6 +121,8 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
                 _randStrategiesAndWadsToSlash(operatorSet);
             slashingParams = avs.slashOperator(operator, operatorSet.id, strategiesToSlash, wadsToSlash);
             assert_Snap_Allocations_Slashed(slashingParams, operatorSet, true, "operator allocations should be slashed");
+            assert_Snap_Unchanged_StakerDepositShares(staker, "staker deposit shares should be unchanged after slashing");
+            assert_Snap_StakerWithdrawableShares_AfterSlash(staker, allocateParams, slashingParams, "staker deposit shares should be slashed");
         }
 
         // 5. Undelegate from an operator
@@ -188,6 +190,8 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
                 _randStrategiesAndWadsToSlash(operatorSet);
             slashingParams = avs.slashOperator(operator, operatorSet.id, strategiesToSlash, wadsToSlash);
             assert_Snap_Allocations_Slashed(slashingParams, operatorSet, true, "operator allocations should be slashed");
+            assert_Snap_Unchanged_StakerDepositShares(staker, "staker deposit shares should be unchanged after slashing");
+            assert_Snap_StakerWithdrawableShares_AfterSlash(staker, allocateParams, slashingParams, "staker deposit shares should be slashed");
         }
 
         // 5. Undelegate from an operator
@@ -250,6 +254,8 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
                 _randStrategiesAndWadsToSlash(operatorSet);
             slashingParams = avs.slashOperator(operator, operatorSet.id, strategiesToSlash, wadsToSlash);
             assert_Snap_Allocations_Slashed(slashingParams, operatorSet, true, "operator allocations should be slashed");
+            assert_Snap_Unchanged_StakerDepositShares(staker, "staker deposit shares should be unchanged after slashing");
+            assert_Snap_StakerWithdrawableShares_AfterSlash(staker, allocateParams, slashingParams, "staker deposit shares should be slashed");
         }
 
         // 6. Complete withdrawal
@@ -318,6 +324,8 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
                 _randStrategiesAndWadsToSlash(operatorSet);
             slashingParams = avs.slashOperator(operator, operatorSet.id, strategiesToSlash, wadsToSlash);
             assert_Snap_Allocations_Slashed(slashingParams, operatorSet, true, "operator allocations should be slashed");
+            assert_Snap_Unchanged_StakerDepositShares(staker, "staker deposit shares should be unchanged after slashing");
+            assert_Snap_StakerWithdrawableShares_AfterSlash(staker, allocateParams, slashingParams, "staker deposit shares should be slashed");
         }
 
         // 4. Complete withdrawal
@@ -365,12 +373,10 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
         assert_Snap_Allocations_Modified(
             operator, allocateParams, true, "operator allocations should be updated after delay"
         );
-        console.log("block allocation complete", block.number);
 
         // 4. Deallocate all.
-        operator.deallocateAll(operatorSet);
+        IAllocationManagerTypes.AllocateParams memory deallocateParams = operator.deallocateAll(operatorSet);
         _rollBlocksForCompleteAllocation(operator, operatorSet, strategies);
-        console.log("block deallocation complete", block.number);
 
         // 5. Slash operator
         IAllocationManagerTypes.SlashingParams memory slashingParams;
@@ -379,6 +385,8 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
                 _randStrategiesAndWadsToSlash(operatorSet);
             slashingParams = avs.slashOperator(operator, operatorSet.id, strategiesToSlash, wadsToSlash);
             assert_Snap_Allocations_Slashed(slashingParams, operatorSet, true, "operator allocations should be slashed");
+            assert_Snap_Unchanged_StakerDepositShares(staker, "staker deposit shares should be unchanged after slashing");
+            assert_Snap_StakerWithdrawableShares_AfterSlash(staker, deallocateParams, slashingParams, "staker deposit shares should be slashed");
         }
 
         // 6. Queue withdrawals
@@ -447,6 +455,8 @@ contract Integration_Deposit_Delegate_Allocate is IntegrationCheckUtils {
                 _randStrategiesAndWadsToSlash(operatorSet);
             slashingParams = avs.slashOperator(operator, operatorSet.id, strategiesToSlash, wadsToSlash);
             assert_Snap_Allocations_Slashed(slashingParams, operatorSet, true, "operator allocations should be slashed");
+            assert_Snap_Unchanged_StakerDepositShares(staker, "staker deposit shares should be unchanged after slashing");
+            assert_Snap_StakerWithdrawableShares_AfterSlash(staker, allocateParams, slashingParams, "staker deposit shares should be slashed");
         }
     }
 }