improve test and add param to event

yieldnest · Sep 8, 2024 · f660162 · f660162
1 parent 4f504f0
commit f660162
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/WithdrawalQueueManager.sol b/src/WithdrawalQueueManager.sol
@@ -16,7 +16,13 @@ import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 interface IWithdrawalQueueManagerEvents {
     event WithdrawalRequested(uint256 indexed tokenId, address indexed requester, uint256 amount);
-    event WithdrawalClaimed(uint256 indexed tokenId, address claimer, address receiver, IWithdrawalQueueManager.WithdrawalRequest request);
+    event WithdrawalClaimed(
+        uint256 indexed tokenId,
+        address claimer,
+        address receiver,
+        IWithdrawalQueueManager.WithdrawalRequest request,
+        uint256 finalizationId
+    );
     event WithdrawalFeeUpdated(uint256 newFeePercentage);
     event FeeReceiverUpdated(address indexed oldFeeReceiver, address indexed newFeeReceiver);
     event SecondsToFinalizationUpdated(uint256 previousValue, uint256 newValue);
@@ -304,7 +310,7 @@ contract WithdrawalQueueManager is IWithdrawalQueueManager, ERC721EnumerableUpgr
             redemptionAssetsVault.transferRedemptionAssets(feeReceiver, feeAmount, request.data);
         }
 
-        emit WithdrawalClaimed(tokenId, msg.sender, receiver, request);
+        emit WithdrawalClaimed(tokenId, msg.sender, receiver, request, finalizationId);
     }
 
     /**

diff --git a/test/unit/ynETHWithdrawalQueueManager_unit.t.sol b/test/unit/ynETHWithdrawalQueueManager_unit.t.sol
@@ -872,8 +872,8 @@ contract ynETHWithdrawalQueueManagerTest is Test {
         manager.finalizeRequestsUpToIndex(2);  // Finalization 0: tokenIds 0-1
         manager.finalizeRequestsUpToIndex(5);  // Finalization 1: tokenIds 2-4
         manager.finalizeRequestsUpToIndex(8);  // Finalization 2: tokenIds 5-7
-        manager.finalizeRequestsUpToIndex(10); // Finalization 3: tokenIds 8-9
-        manager.finalizeRequestsUpToIndex(12); // Finalization 4: tokenIds 10-11
+        manager.finalizeRequestsUpToIndex(9); // Finalization 3: tokenIds 8-8
+        manager.finalizeRequestsUpToIndex(12); // Finalization 4: tokenIds 9-11
         vm.stopPrank();
 
         // Test finding finalization for each token ID
@@ -887,7 +887,7 @@ contract ynETHWithdrawalQueueManagerTest is Test {
         expectedFinalizationIds[6] = 2;
         expectedFinalizationIds[7] = 2;
         expectedFinalizationIds[8] = 3;
-        expectedFinalizationIds[9] = 3;
+        expectedFinalizationIds[9] = 4;
         expectedFinalizationIds[10] = 4;
         expectedFinalizationIds[11] = 4;
         for (uint256 i = 0; i < 12; i++) {