escrow tests fixes

lidofinance · Nov 22, 2024 · 0c9d7bb · 0c9d7bb
1 parent a4ff926
commit 0c9d7bb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/contracts/Escrow.sol b/contracts/Escrow.sol
@@ -516,6 +516,13 @@ contract Escrow is IEscrow {
         state.lastAssetsLockTimestamp = assets.lastAssetsLockTimestamp.toSeconds();
     }
 
+    // @notice Retrieves the unstETH NFT ids of the specified vetoer.
+    /// @param vetoer The address of the vetoer whose unstETH NFTs are being queried.
+    /// @return unstETHIds An array of unstETH NFT IDs locked by the vetoer.
+    function getVetoerUnstETHIds(address vetoer) external view returns (uint256[] memory unstETHIds) {
+        return _accounting.assets[vetoer].unstETHIds;
+    }
+
     /// @notice Returns the total count of unstETH NFTs that have not been claimed yet.
     /// @return unclaimedUnstETHIdsCount The total number of unclaimed unstETH NFTs.
     function getUnclaimedUnstETHIdsCount() external view returns (uint256) {

diff --git a/test/unit/Escrow.t.sol b/test/unit/Escrow.t.sol
@@ -15,7 +15,7 @@ import {PercentD16, PercentsD16} from "contracts/types/PercentD16.sol";
 import {Escrow, LockedAssetsTotals, VetoerState} from "contracts/Escrow.sol";
 
 import {EscrowState as EscrowStateLib, State as EscrowState} from "contracts/libraries/EscrowState.sol";
-import {WithdrawalsBatchesQueue} from "contracts/libraries/WithdrawalBatchesQueue.sol";
+import {WithdrawalsBatchesQueue} from "contracts/libraries/WithdrawalsBatchesQueue.sol";
 import {AssetsAccounting, UnstETHRecordStatus} from "contracts/libraries/AssetsAccounting.sol";
 
 import {IEscrow} from "contracts/interfaces/IEscrow.sol";
@@ -483,7 +483,7 @@ contract EscrowUnitTests is UnitTest {
         vm.expectEmit();
         emit EscrowStateLib.RageQuitStarted(Durations.ZERO, Durations.ZERO);
         vm.expectEmit();
-        emit WithdrawalsBatchesQueue.WithdrawalBatchesQueueOpened(lri);
+        emit WithdrawalsBatchesQueue.WithdrawalsBatchesQueueOpened(lri);
 
         transitToRageQuit();
     }
@@ -504,7 +504,7 @@ contract EscrowUnitTests is UnitTest {
         uint256[] memory unstEthIds = getUnstEthIdsFromWQ();
 
         vm.expectEmit();
-        emit WithdrawalsBatchesQueue.WithdrawalBatchesQueueOpened(unstEthIds[0] - 1);
+        emit WithdrawalsBatchesQueue.WithdrawalsBatchesQueueOpened(unstEthIds[0] - 1);
         transitToRageQuit();
 
         WithdrawalQueueMock(_withdrawalQueue).setRequestWithdrawalsResult(unstEthIds);
@@ -516,7 +516,7 @@ contract EscrowUnitTests is UnitTest {
         vm.expectEmit();
         emit WithdrawalsBatchesQueue.UnstETHIdsAdded(unstEthIds);
         vm.expectEmit();
-        emit WithdrawalsBatchesQueue.WithdrawalBatchesQueueClosed();
+        emit WithdrawalsBatchesQueue.WithdrawalsBatchesQueueClosed();
         _escrow.requestNextWithdrawalsBatch(100);
     }
 
@@ -547,7 +547,7 @@ contract EscrowUnitTests is UnitTest {
         uint256[] memory unstEthIds = getUnstEthIdsFromWQ();
 
         vm.expectEmit();
-        emit WithdrawalsBatchesQueue.WithdrawalBatchesQueueOpened(unstEthIds[0] - 1);
+        emit WithdrawalsBatchesQueue.WithdrawalsBatchesQueueOpened(unstEthIds[0] - 1);
         transitToRageQuit();
 
         WithdrawalQueueMock(_withdrawalQueue).setRequestWithdrawalsResult(unstEthIds);
@@ -1479,9 +1479,11 @@ contract EscrowUnitTests is UnitTest {
     }
 
     function ensureWithdrawalsBatchesQueueClosed() internal {
-        vm.expectEmit();
-        emit WithdrawalsBatchesQueue.WithdrawalBatchesQueueClosed();
-        _escrow.requestNextWithdrawalsBatch(100);
+        if (!_escrow.isWithdrawalsBatchesFinalized()) {
+            vm.expectEmit();
+            emit WithdrawalsBatchesQueue.WithdrawalsBatchesQueueClosed();
+            _escrow.requestNextWithdrawalsBatch(100);
+        }
     }
 
     function ensureRageQuitExtensionPeriodStartedNow() internal {