refactor: remove inconsistent alias

Author: 0xClandestine

src/contracts/core/DelegationManager.sol

@@ -963,17 +963,10 @@ contract DelegationManager is
 
         return (strategies, shares);
     }
-
+    
     /// @inheritdoc IDelegationManager
     function getQueuedWithdrawal(
         bytes32 withdrawalRoot
-    ) external view returns (Withdrawal memory) {
-        return queuedWithdrawals[withdrawalRoot];
-    }
-
-    /// @inheritdoc IDelegationManager
-    function getQueuedWithdrawalFromRoot(
-        bytes32 withdrawalRoot
     ) external view returns (Withdrawal memory withdrawal, uint256[] memory shares) {
         (withdrawal, shares) = _getSharesByWithdrawalRoot(withdrawalRoot);
     }

src/contracts/core/DelegationManagerStorage.sol

@@ -111,7 +111,7 @@ abstract contract DelegationManagerStorage is IDelegationManager {
 
     /// @notice Returns the details of a queued withdrawal given by `withdrawalRoot`.
     /// @dev This variable only reflects withdrawals that were made after the slashing release.
-    mapping(bytes32 withdrawalRoot => Withdrawal withdrawal) internal queuedWithdrawals;
+    mapping(bytes32 withdrawalRoot => Withdrawal withdrawal) public queuedWithdrawals;
 
     /// @notice Contains history of the total cumulative staker withdrawals for an operator and a given strategy.
     /// Used to calculate burned StrategyManager shares when an operator is slashed.

src/contracts/interfaces/IDelegationManager.sol

@@ -471,11 +471,17 @@ interface IDelegationManager is ISignatureUtilsMixin, IDelegationManagerErrors,
      */
     function depositScalingFactor(address staker, IStrategy strategy) external view returns (uint256);
 
-    /// @notice Returns the Withdrawal associated with a `withdrawalRoot`, if it exists. NOTE that
-    /// withdrawals queued before the slashing release can NOT be queried with this method.
+    /**
+     * @notice Returns the Withdrawal and corresponding shares associated with a `withdrawalRoot`
+     * @param withdrawalRoot The hash identifying the queued withdrawal
+     * @return withdrawal The withdrawal details
+     * @return shares Array of shares corresponding to each strategy in the withdrawal
+     * @dev The shares are what a user would receive from completing a queued withdrawal, assuming all slashings are applied
+     * @dev Withdrawals queued before the slashing release cannot be queried with this method
+     */
     function getQueuedWithdrawal(
         bytes32 withdrawalRoot
-    ) external view returns (Withdrawal memory);
+    ) external view returns (Withdrawal memory withdrawal, uint256[] memory shares);
 
     /**
      * @notice Returns all queued withdrawals and their corresponding shares for a staker.
@@ -488,17 +494,6 @@ interface IDelegationManager is ISignatureUtilsMixin, IDelegationManagerErrors,
         address staker
     ) external view returns (Withdrawal[] memory withdrawals, uint256[][] memory shares);
 
-    /**
-     * @notice Returns the withdrawal details and corresponding shares for a specific queued withdrawal.
-     * @param withdrawalRoot The hash identifying the queued withdrawal.
-     * @return withdrawal The withdrawal details.
-     * @return shares Array of shares corresponding to each strategy in the withdrawal.
-     * @dev The shares are what a user would receive from completing a queued withdrawal, assuming all slashings are applied.
-     */
-    function getQueuedWithdrawalFromRoot(
-        bytes32 withdrawalRoot
-    ) external view returns (Withdrawal memory withdrawal, uint256[] memory shares);
-
     /// @notice Returns a list of queued withdrawal roots for the `staker`.
     /// NOTE that this only returns withdrawals queued AFTER the slashing release.
     function getQueuedWithdrawalRoots(

src/test/unit/DelegationUnit.t.sol

@@ -4846,7 +4846,7 @@ contract DelegationManagerUnitTests_queueWithdrawals is DelegationManagerUnitTes
         cheats.prank(defaultStaker);
         bytes32 withdrawalRoot = delegationManager.queueWithdrawals(queuedWithdrawalParams)[0];
 
-        Withdrawal memory withdrawal = delegationManager.getQueuedWithdrawal(withdrawalRoot);
+        (Withdrawal memory withdrawal, ) = delegationManager.getQueuedWithdrawal(withdrawalRoot);
         assertEq(withdrawal.staker, defaultStaker, "staker should be msg.sender");
         assertEq(withdrawal.withdrawer, defaultStaker, "withdrawer should be msg.sender");
     }
@@ -8670,16 +8670,16 @@ contract DelegationManagerUnitTests_getQueuedWithdrawals is DelegationManagerUni
 
         // Get shares from withdrawal - should return 50 shares (100 * 0.5) using original magnitude
         // rather than incorrectly returning 100 shares (100 * 1.0) using new magnitude
-        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawalFromRoot(withdrawalRoot);
+        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawal(withdrawalRoot);
         assertEq(shares[0], 50e18, "shares should be 50e18 (100e18 * 0.5) using original magnitude");
     }
 }
 
-contract DelegationManagerUnitTests_getQueuedWithdrawalFromRoot is DelegationManagerUnitTests {
+contract DelegationManagerUnitTests_getQueuedWithdrawal is DelegationManagerUnitTests {
     using ArrayLib for *;
     using SlashingLib for *;
 
-    function test_getQueuedWithdrawalFromRoot_Correctness(Randomness r) public rand(r) {
+    function test_getQueuedWithdrawal_Correctness(Randomness r) public rand(r) {
         // Set up initial deposit
         uint256 depositAmount = r.Uint256(1 ether, 100 ether);
         _depositIntoStrategies(defaultStaker, strategyMock.toArray(), depositAmount.toArrayU256());
@@ -8703,14 +8703,14 @@ contract DelegationManagerUnitTests_getQueuedWithdrawalFromRoot is DelegationMan
         delegationManager.queueWithdrawals(queuedWithdrawalParams);
 
         // Get shares from queued withdrawal
-        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawalFromRoot(withdrawalRoot);
+        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawal(withdrawalRoot);
 
         // Verify withdrawal details match
         assertEq(shares.length, 1, "incorrect shares array length");
         assertEq(shares[0], depositAmount, "incorrect shares amount");
     }
 
-    function test_getQueuedWithdrawalFromRoot_AfterSlashing(Randomness r) public rand(r) {
+    function test_getQueuedWithdrawal_AfterSlashing(Randomness r) public rand(r) {
         // Set up initial deposit
         uint256 depositAmount = r.Uint256(1 ether, 100 ether);
         _depositIntoStrategies(defaultStaker, strategyMock.toArray(), depositAmount.toArrayU256());
@@ -8739,20 +8739,20 @@ contract DelegationManagerUnitTests_getQueuedWithdrawalFromRoot is DelegationMan
         delegationManager.slashOperatorShares(defaultOperator, strategyMock, WAD, 0.5 ether);
 
         // Get shares from queued withdrawal
-        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawalFromRoot(withdrawalRoot);
+        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawal(withdrawalRoot);
 
         // Verify withdrawal details match and shares are slashed
         assertEq(shares.length, 1, "incorrect shares array length");
         assertEq(shares[0], depositAmount / 2, "shares not properly slashed");
     }
 
-    function test_getQueuedWithdrawalFromRoot_NonexistentWithdrawal() public {
+    function test_getQueuedWithdrawal_NonexistentWithdrawal() public {
         bytes32 nonexistentRoot = bytes32(uint256(1));
-        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawalFromRoot(nonexistentRoot);
+        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawal(nonexistentRoot);
         assertEq(shares.length, 0, "shares array should be empty");
     }
 
-    function test_getQueuedWithdrawalFromRoot_MultipleStrategies(Randomness r) public rand(r) {
+    function test_getQueuedWithdrawal_MultipleStrategies(Randomness r) public rand(r) {
         // Set up multiple strategies with deposits
         uint256 numStrategies = r.Uint256(2, 5);
         uint256[] memory depositShares = r.Uint256Array({
@@ -8782,7 +8782,7 @@ contract DelegationManagerUnitTests_getQueuedWithdrawalFromRoot is DelegationMan
         delegationManager.queueWithdrawals(queuedWithdrawalParams);
 
         // Get shares from queued withdrawal
-        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawalFromRoot(withdrawalRoot);
+        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawal(withdrawalRoot);
 
         // Verify withdrawal details and shares for each strategy
         assertEq(shares.length, numStrategies, "incorrect shares array length");
@@ -8791,8 +8791,8 @@ contract DelegationManagerUnitTests_getQueuedWithdrawalFromRoot is DelegationMan
         }
     }
 
-    function testFuzz_getQueuedWithdrawalFromRoot_EmptyWithdrawal(bytes32 withdrawalRoot) public {
-        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawalFromRoot(withdrawalRoot);
+    function testFuzz_getQueuedWithdrawal_EmptyWithdrawal(bytes32 withdrawalRoot) public {
+        (, uint256[] memory shares) = delegationManager.getQueuedWithdrawal(withdrawalRoot);
         assertEq(shares.length, 0, "sanity check");
     }
 }