Skip to content

Commit 671ed2b

Browse files
ypatil12ypatil12
committed
chore: format
1 parent 23fde22 commit 671ed2b

File tree

2 files changed

+24
-106
lines changed

2 files changed

+24
-106
lines changed

‎src/contracts/core/AllocationManager.sol‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,7 @@ contract AllocationManager is
6363
function slashOperator(
6464
address avs,
6565
SlashingParams calldata params
66-
)
67-
external
68-
onlyWhenNotPaused(PAUSED_OPERATOR_SLASHING)
69-
checkCanCall(avs)
70-
returns (uint256, uint256[] memory)
71-
{
66+
) external onlyWhenNotPaused(PAUSED_OPERATOR_SLASHING) checkCanCall(avs) returns (uint256, uint256[] memory) {
7267
// Check that the operator set exists and the operator is registered to it
7368
OperatorSet memory operatorSet = OperatorSet(avs, params.operatorSetId);
7469
require(params.strategies.length == params.wadsToSlash.length, InputArrayLengthMismatch());
@@ -320,7 +315,6 @@ contract AllocationManager is
320315
* INTERNAL FUNCTIONS
321316
*
322317
*/
323-
324318
function _slashOperator(
325319
SlashingParams calldata params,
326320
OperatorSet memory operatorSet

‎src/test/unit/DelegationUnit.t.sol‎

Lines changed: 23 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -3603,12 +3603,7 @@ contract DelegationManagerUnitTests_undelegate is DelegationManagerUnitTests {
36033603
_setOperatorMagnitude(defaultOperator, strategy, newMaxMagnitude);
36043604
cheats.prank(address(allocationManagerMock));
36053605
delegationManager.slashOperatorShares(
3606-
defaultOperator,
3607-
defaultOperatorSet,
3608-
defaultSlashId,
3609-
strategy,
3610-
prevMaxMagnitude,
3611-
newMaxMagnitude
3606+
defaultOperator, defaultOperatorSet, defaultSlashId, strategy, prevMaxMagnitude, newMaxMagnitude
36123607
);
36133608
(, uint operatorSharesAfterSlash) = _assertOperatorSharesAfterSlash({
36143609
operator: defaultOperator,
@@ -3719,9 +3714,7 @@ contract DelegationManagerUnitTests_undelegate is DelegationManagerUnitTests {
37193714
{
37203715
_setOperatorMagnitude(defaultOperator, strategy, operatorMagnitude);
37213716
cheats.prank(address(allocationManagerMock));
3722-
delegationManager.slashOperatorShares(
3723-
defaultOperator, defaultOperatorSet, defaultSlashId, strategy, WAD, uint64(0)
3724-
);
3717+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategy, WAD, uint64(0));
37253718
operatorSharesAfterSlash = delegationManager.operatorShares(defaultOperator, strategy);
37263719
assertEq(operatorSharesAfterSlash, 0, "operator shares not fully slashed");
37273720
}
@@ -3831,12 +3824,7 @@ contract DelegationManagerUnitTests_undelegate is DelegationManagerUnitTests {
38313824

38323825
cheats.prank(address(allocationManagerMock));
38333826
delegationManager.slashOperatorShares(
3834-
defaultOperator,
3835-
defaultOperatorSet,
3836-
defaultSlashId,
3837-
strategyMock,
3838-
prevMaxMagnitude,
3839-
newMaxMagnitude
3827+
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, prevMaxMagnitude, newMaxMagnitude
38403828
);
38413829
_assertOperatorSharesAfterSlash({
38423830
operator: defaultOperator,
@@ -4480,12 +4468,7 @@ contract DelegationManagerUnitTests_queueWithdrawals is DelegationManagerUnitTes
44804468
_setOperatorMagnitude(defaultOperator, strategyMock, newMaxMagnitude);
44814469
cheats.prank(address(allocationManagerMock));
44824470
delegationManager.slashOperatorShares(
4483-
defaultOperator,
4484-
defaultOperatorSet,
4485-
defaultSlashId,
4486-
strategyMock,
4487-
prevMaxMagnitude,
4488-
newMaxMagnitude
4471+
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, prevMaxMagnitude, newMaxMagnitude
44894472
);
44904473
// Assertions on amount burned
44914474
(uint operatorSharesSlashed,) = _assertOperatorSharesAfterSlash({
@@ -4566,9 +4549,7 @@ contract DelegationManagerUnitTests_queueWithdrawals is DelegationManagerUnitTes
45664549
uint64 operatorMagnitude = 0;
45674550
_setOperatorMagnitude(defaultOperator, strategyMock, operatorMagnitude);
45684551
cheats.prank(address(allocationManagerMock));
4569-
delegationManager.slashOperatorShares(
4570-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0)
4571-
);
4552+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0));
45724553
_assertOperatorSharesAfterSlash({
45734554
operator: defaultOperator,
45744555
strategy: strategyMock,
@@ -4803,12 +4784,7 @@ contract DelegationManagerUnitTests_queueWithdrawals is DelegationManagerUnitTes
48034784
for (uint i = 0; i < strategies.length; i++) {
48044785
uint operatorSharesBefore = delegationManager.operatorShares(defaultOperator, strategies[i]);
48054786
delegationManager.slashOperatorShares(
4806-
defaultOperator,
4807-
defaultOperatorSet,
4808-
defaultSlashId,
4809-
strategies[i],
4810-
prevMaxMagnitudes[i],
4811-
newMaxMagnitudes[i]
4787+
defaultOperator, defaultOperatorSet, defaultSlashId, strategies[i], prevMaxMagnitudes[i], newMaxMagnitudes[i]
48124788
);
48134789
// Assert correct amount of shares slashed from operator
48144790
(slashedOperatorShares[i],) = _assertOperatorSharesAfterSlash({
@@ -5118,9 +5094,7 @@ contract DelegationManagerUnitTests_completeQueuedWithdrawal is DelegationManage
51185094
// Slash all of operator's shares
51195095
_setOperatorMagnitude(defaultOperator, strategyMock, 0);
51205096
cheats.prank(address(allocationManagerMock));
5121-
delegationManager.slashOperatorShares(
5122-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0)
5123-
);
5097+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0));
51245098

51255099
// Complete withdrawal as shares and check that withdrawal was cleared
51265100
cheats.roll(block.number + 1);
@@ -5294,12 +5268,7 @@ contract DelegationManagerUnitTests_completeQueuedWithdrawal is DelegationManage
52945268
_setOperatorMagnitude(defaultOperator, strategyMock, newMaxMagnitude);
52955269
cheats.prank(address(allocationManagerMock));
52965270
delegationManager.slashOperatorShares(
5297-
defaultOperator,
5298-
defaultOperatorSet,
5299-
defaultSlashId,
5300-
withdrawal.strategies[0],
5301-
prevMaxMagnitude,
5302-
newMaxMagnitude
5271+
defaultOperator, defaultOperatorSet, defaultSlashId, withdrawal.strategies[0], prevMaxMagnitude, newMaxMagnitude
53035272
);
53045273
uint operatorSharesAfterSlash = delegationManager.operatorShares(defaultOperator, strategyMock);
53055274
assertEq(
@@ -5491,12 +5460,7 @@ contract DelegationManagerUnitTests_completeQueuedWithdrawal is DelegationManage
54915460
_setOperatorMagnitude(defaultOperator, withdrawal.strategies[0], operatorMagnitude);
54925461
cheats.prank(address(allocationManagerMock));
54935462
delegationManager.slashOperatorShares(
5494-
defaultOperator,
5495-
defaultOperatorSet,
5496-
defaultSlashId,
5497-
withdrawal.strategies[0],
5498-
WAD,
5499-
operatorMagnitude
5463+
defaultOperator, defaultOperatorSet, defaultSlashId, withdrawal.strategies[0], WAD, operatorMagnitude
55005464
);
55015465
uint operatorSharesAfterAVSSlash = delegationManager.operatorShares(defaultOperator, beaconChainETHStrategy);
55025466
assertApproxEqAbs(
@@ -5650,19 +5614,15 @@ contract DelegationManagerUnitTests_slashingShares is DelegationManagerUnitTests
56505614

56515615
cheats.startPrank(invalidCaller);
56525616
cheats.expectRevert(IDelegationManagerErrors.OnlyAllocationManager.selector);
5653-
delegationManager.slashOperatorShares(
5654-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, uint64(0), uint64(0)
5655-
);
5617+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, uint64(0), uint64(0));
56565618
}
56575619

56585620
/// @notice Verifies that there is no change in shares if the staker is not delegatedd
56595621
function testFuzz_Revert_slashOperatorShares_noop() public {
56605622
_registerOperatorWithBaseDetails(defaultOperator);
56615623

56625624
cheats.prank(address(allocationManagerMock));
5663-
delegationManager.slashOperatorShares(
5664-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, (WAD / 2)
5665-
);
5625+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, (WAD / 2));
56665626
assertEq(delegationManager.operatorShares(defaultOperator, strategyMock), 0, "shares should not have changed");
56675627
}
56685628

@@ -5692,9 +5652,7 @@ contract DelegationManagerUnitTests_slashingShares is DelegationManagerUnitTests
56925652
// Slash all of operator's shares
56935653
_setOperatorMagnitude(defaultOperator, strategyMock, 0);
56945654
cheats.prank(address(allocationManagerMock));
5695-
delegationManager.slashOperatorShares(
5696-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0)
5697-
);
5655+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0));
56985656

56995657
uint slashableSharesInQueueAfter = delegationManager.getSlashableSharesInQueue(defaultOperator, strategyMock);
57005658

@@ -5744,9 +5702,7 @@ contract DelegationManagerUnitTests_slashingShares is DelegationManagerUnitTests
57445702
// Slash all of operator's shares
57455703
_setOperatorMagnitude(defaultOperator, strategyMock, 0);
57465704
cheats.prank(address(allocationManagerMock));
5747-
delegationManager.slashOperatorShares(
5748-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0)
5749-
);
5705+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0));
57505706

57515707
// Complete withdrawal as tokens and assert that we call back into the SM with 100 tokens
57525708
IERC20[] memory tokens = strategyMock.underlyingToken().toArray();
@@ -5805,9 +5761,7 @@ contract DelegationManagerUnitTests_slashingShares is DelegationManagerUnitTests
58055761
strategyMock,
58065762
depositAmount / 6 // 1 withdrawal not queued so decreased
58075763
);
5808-
delegationManager.slashOperatorShares(
5809-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0)
5810-
);
5764+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, uint64(0));
58115765

58125766
// Assert slashable shares
58135767
slashableSharesInQueue = delegationManager.getSlashableSharesInQueue(defaultOperator, strategyMock);
@@ -5957,9 +5911,7 @@ contract DelegationManagerUnitTests_slashingShares is DelegationManagerUnitTests
59575911
emit OperatorSharesSlashed(operator, strategyMock, sharesToBurn);
59585912

59595913
cheats.prank(address(allocationManagerMock));
5960-
delegationManager.slashOperatorShares(
5961-
operator, defaultOperatorSet, defaultSlashId, strategyMock, initMagnitude, newMagnitude
5962-
);
5914+
delegationManager.slashOperatorShares(operator, defaultOperatorSet, defaultSlashId, strategyMock, initMagnitude, newMagnitude);
59635915

59645916
uint queuedSlashableSharesAfter = delegationManager.getSlashableSharesInQueue(operator, strategyMock);
59655917
uint operatorSharesAfter = delegationManager.operatorShares(operator, strategyMock);
@@ -6668,12 +6620,7 @@ contract DelegationManagerUnitTests_slashingShares is DelegationManagerUnitTests
66686620
_setOperatorMagnitude(defaultOperator, beaconChainETHStrategy, newMaxMagnitude);
66696621
cheats.prank(address(allocationManagerMock));
66706622
delegationManager.slashOperatorShares(
6671-
defaultOperator,
6672-
defaultOperatorSet,
6673-
defaultSlashId,
6674-
beaconChainETHStrategy,
6675-
initialMagnitude,
6676-
newMaxMagnitude
6623+
defaultOperator, defaultOperatorSet, defaultSlashId, beaconChainETHStrategy, initialMagnitude, newMaxMagnitude
66776624
);
66786625

66796626
// save the outcome
@@ -6729,12 +6676,7 @@ contract DelegationManagerUnitTests_slashingShares is DelegationManagerUnitTests
67296676
_setOperatorMagnitude(defaultOperator2, beaconChainETHStrategy, newMaxMagnitude);
67306677
cheats.prank(address(allocationManagerMock));
67316678
delegationManager.slashOperatorShares(
6732-
defaultOperator2,
6733-
defaultOperatorSet,
6734-
defaultSlashId,
6735-
beaconChainETHStrategy,
6736-
initialMagnitude,
6737-
newMaxMagnitude
6679+
defaultOperator2, defaultOperatorSet, defaultSlashId, beaconChainETHStrategy, initialMagnitude, newMaxMagnitude
67386680
);
67396681

67406682
uint expectedWithdrawable = _calcWithdrawableShares(
@@ -7375,9 +7317,7 @@ contract DelegationManagerUnitTests_Lifecycle is DelegationManagerUnitTests {
73757317
{
73767318
_setOperatorMagnitude(defaultOperator, strategy, operatorMagnitude);
73777319
cheats.prank(address(allocationManagerMock));
7378-
delegationManager.slashOperatorShares(
7379-
defaultOperator, defaultOperatorSet, defaultSlashId, strategy, WAD, uint64(0)
7380-
);
7320+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategy, WAD, uint64(0));
73817321
operatorSharesAfterSlash = delegationManager.operatorShares(defaultOperator, strategy);
73827322
assertEq(operatorSharesAfterSlash, 0, "operator shares not fully slashed");
73837323
}
@@ -7568,9 +7508,7 @@ contract DelegationManagerUnitTests_getQueuedWithdrawals is DelegationManagerUni
75687508
uint newStakerShares = depositShares[i] / 2;
75697509
_setOperatorMagnitude(defaultOperator, strategies[i], 0.5 ether);
75707510
cheats.prank(address(allocationManagerMock));
7571-
delegationManager.slashOperatorShares(
7572-
defaultOperator, defaultOperatorSet, defaultSlashId, strategies[i], WAD, (0.5 ether)
7573-
);
7511+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategies[i], WAD, (0.5 ether));
75747512
uint afterSlash = delegationManager.operatorShares(defaultOperator, strategies[i]);
75757513
assertApproxEqAbs(afterSlash, newStakerShares, 1, "bad operator shares after slash");
75767514
}
@@ -7606,9 +7544,7 @@ contract DelegationManagerUnitTests_getQueuedWithdrawals is DelegationManagerUni
76067544
uint newStakerShares = totalDepositShares / 2;
76077545
_setOperatorMagnitude(defaultOperator, strategyMock, 0.5 ether);
76087546
cheats.prank(address(allocationManagerMock));
7609-
delegationManager.slashOperatorShares(
7610-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, (0.5 ether)
7611-
);
7547+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, (0.5 ether));
76127548
uint afterSlash = delegationManager.operatorShares(defaultOperator, strategyMock);
76137549
assertApproxEqAbs(afterSlash, newStakerShares, 1, "bad operator shares after slash");
76147550

@@ -7683,12 +7619,7 @@ contract DelegationManagerUnitTests_getQueuedWithdrawals is DelegationManagerUni
76837619
_setOperatorMagnitude(defaultOperator, strategyMock, 50e16);
76847620
cheats.prank(address(allocationManagerMock));
76857621
delegationManager.slashOperatorShares(
7686-
defaultOperator,
7687-
defaultOperatorSet,
7688-
defaultSlashId,
7689-
withdrawal.strategies[0],
7690-
uint64(WAD),
7691-
(50e16)
7622+
defaultOperator, defaultOperatorSet, defaultSlashId, withdrawal.strategies[0], uint64(WAD), (50e16)
76927623
);
76937624
uint operatorSharesAfterSlash = delegationManager.operatorShares(defaultOperator, strategyMock);
76947625
assertEq(
@@ -7716,12 +7647,7 @@ contract DelegationManagerUnitTests_getQueuedWithdrawals is DelegationManagerUni
77167647
_setOperatorMagnitude(defaultOperator, strategyMock, 25e16);
77177648
cheats.prank(address(allocationManagerMock));
77187649
delegationManager.slashOperatorShares(
7719-
defaultOperator,
7720-
defaultOperatorSet,
7721-
defaultSlashId,
7722-
withdrawal.strategies[0],
7723-
(50e16),
7724-
(25e16)
7650+
defaultOperator, defaultOperatorSet, defaultSlashId, withdrawal.strategies[0], (50e16), (25e16)
77257651
);
77267652
uint operatorSharesAfterSecondSlash = delegationManager.operatorShares(defaultOperator, strategyMock);
77277653
assertEq(operatorSharesAfterSecondSlash, operatorShares - sharesToDecrement, "operator shares should be decreased after slash");
@@ -7832,9 +7758,7 @@ contract DelegationManagerUnitTests_getQueuedWithdrawal is DelegationManagerUnit
78327758
// Slash operator by 50%
78337759
_setOperatorMagnitude(defaultOperator, strategyMock, 0.5 ether);
78347760
cheats.prank(address(allocationManagerMock));
7835-
delegationManager.slashOperatorShares(
7836-
defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, (0.5 ether)
7837-
);
7761+
delegationManager.slashOperatorShares(defaultOperator, defaultOperatorSet, defaultSlashId, strategyMock, WAD, (0.5 ether));
78387762

78397763
// Get shares from queued withdrawal
78407764
(, uint[] memory shares) = delegationManager.getQueuedWithdrawal(withdrawalRoot);

0 commit comments

Comments
 (0)