@@ -186,36 +186,6 @@ abstract contract IntegrationBase is IntegrationDeployer {
186186
187187 return result;
188188 }
189-
190- /// @dev Choose a random subset of validators (selects AT LEAST ONE but NOT ALL)
191- function _chooseSubset (uint40 [] memory validators ) internal returns (uint40 [] memory ) {
192- require (validators.length >= 2 , "Need at least 2 validators to choose subset " );
193-
194- uint40 [] memory result = new uint40 [](validators.length );
195- uint newLen;
196-
197- uint rand = _randUint ({ min: 1 , max: validators.length ** 2 });
198- for (uint i = 0 ; i < validators.length ; i++ ) {
199- if (rand >> i & 1 == 1 ) {
200- result[newLen] = validators[i];
201- newLen++ ;
202- }
203- }
204-
205- // If we picked all, remove one random validator
206- if (newLen == validators.length ) {
207- uint indexToRemove = _randUint ({ min: 0 , max: validators.length - 1 });
208- for (uint i = indexToRemove; i < newLen - 1 ; i++ ) {
209- result[i] = result[i + 1 ];
210- }
211- newLen-- ;
212- }
213-
214- // Update array length
215- assembly { mstore (result, newLen) }
216-
217- return result;
218- }
219189
220190 function _getTokenName (IERC20 token ) internal view returns (string memory ) {
221191 if (token == NATIVE_ETH) {
@@ -591,11 +561,8 @@ abstract contract IntegrationBase is IntegrationDeployer {
591561 uint wadToSlash = slashingParams.wadsToSlash[slashingParams.strategies.indexOf (strat)];
592562 slashedShares = prevShares[i].mulWadRoundUp (allocateParams.newMagnitudes[i].mulWadRoundUp (wadToSlash));
593563 }
594- console.log (prevShares[i]);
595- console.log (slashedShares);
596- console.log (curShares[i]);
597564
598- assertApproxEqAbs (prevShares[i] - slashedShares, curShares[i], 1000 , err);
565+ assertApproxEqAbs (prevShares[i] - slashedShares, curShares[i], 1 , err);
599566 }
600567 }
601568
@@ -1166,21 +1133,6 @@ abstract contract IntegrationBase is IntegrationDeployer {
11661133
11671134 return (strategies.sort (), wadsToSlash);
11681135 }
1169-
1170- function _strategiesAndWadsForFullSlash (
1171- OperatorSet memory operatorSet
1172- ) internal view returns (IStrategy[] memory strategies , uint [] memory wadsToSlash ) {
1173- // Get list of all strategies in an operator set.
1174- strategies = allocationManager.getStrategiesInOperatorSet (operatorSet);
1175-
1176- wadsToSlash = new uint [](strategies.length );
1177-
1178- for (uint i; i < strategies.length ; ++ i) {
1179- wadsToSlash[i] = 1 ether ;
1180- }
1181-
1182- return (strategies.sort (), wadsToSlash);
1183- }
11841136
11851137 function _randMagnitudes (uint64 sum , uint256 len ) internal returns (uint64 [] memory magnitudes ) {
11861138 magnitudes = new uint64 [](len);
@@ -1199,18 +1151,6 @@ abstract contract IntegrationBase is IntegrationDeployer {
11991151 }
12001152 }
12011153
1202- function _maxMagnitudes (OperatorSet memory operatorSet , User operator ) internal view returns (uint64 [] memory magnitudes ) {
1203- IStrategy[] memory strategies = allocationManager.getStrategiesInOperatorSet (operatorSet);
1204- uint256 len = strategies.length ;
1205- magnitudes = new uint64 [](len);
1206-
1207- if (len == 0 ) return magnitudes;
1208-
1209- for (uint256 i; i < len; ++ i) {
1210- magnitudes[i] = allocationManager.getMaxMagnitude (address (operator), strategies[i]);
1211- }
1212- }
1213-
12141154 function _randWithdrawal (
12151155 IStrategy[] memory strategies ,
12161156 uint [] memory shares
0 commit comments