diff --git a/contracts/EscrowDst.sol b/contracts/EscrowDst.sol index ba6f178..6495033 100644 --- a/contracts/EscrowDst.sol +++ b/contracts/EscrowDst.sol @@ -91,6 +91,6 @@ contract EscrowDst is Escrow, IEscrowDst { IERC20(token).safeTransfer(to, immutables.amount); } _ethTransfer(msg.sender, immutables.safetyDeposit); - emit Withdrawal(secret); + emit EscrowWithdrawal(secret); } } diff --git a/contracts/EscrowSrc.sol b/contracts/EscrowSrc.sol index 3dbc7fd..32e6778 100644 --- a/contracts/EscrowSrc.sol +++ b/contracts/EscrowSrc.sol @@ -113,7 +113,7 @@ contract EscrowSrc is Escrow, IEscrowSrc { { IERC20(immutables.token.get()).safeTransfer(target, immutables.amount); _ethTransfer(msg.sender, immutables.safetyDeposit); - emit Withdrawal(secret); + emit EscrowWithdrawal(secret); } /** diff --git a/contracts/interfaces/IBaseEscrow.sol b/contracts/interfaces/IBaseEscrow.sol index b0af116..21acc99 100644 --- a/contracts/interfaces/IBaseEscrow.sol +++ b/contracts/interfaces/IBaseEscrow.sol @@ -39,7 +39,7 @@ interface IBaseEscrow { * @notice Emitted on successful withdrawal. * @param secret The secret that unlocks the escrow. */ - event Withdrawal(bytes32 secret); + event EscrowWithdrawal(bytes32 secret); error InvalidCaller(); error InvalidImmutables(); diff --git a/test/unit/Escrow.t.sol b/test/unit/Escrow.t.sol index da778d3..3acf958 100644 --- a/test/unit/Escrow.t.sol +++ b/test/unit/Escrow.t.sol @@ -124,7 +124,7 @@ contract EscrowTest is BaseSetup { vm.warp(block.timestamp + srcTimelocks.withdrawal + 100); vm.prank(bob.addr); vm.expectEmit(); - emit IBaseEscrow.Withdrawal(SECRET); + emit IBaseEscrow.EscrowWithdrawal(SECRET); swapData.srcClone.withdraw(SECRET, swapData.immutables); assertEq(bob.addr.balance, balanceBobNative + SRC_SAFETY_DEPOSIT); @@ -424,7 +424,7 @@ contract EscrowTest is BaseSetup { // withdraw vm.warp(block.timestamp + dstTimelocks.withdrawal + 10); vm.expectEmit(); - emit IBaseEscrow.Withdrawal(SECRET); + emit IBaseEscrow.EscrowWithdrawal(SECRET); dstClone.withdraw(SECRET, immutables); assertEq(dai.balanceOf(alice.addr), balanceAlice + TAKING_AMOUNT); @@ -449,7 +449,7 @@ contract EscrowTest is BaseSetup { // withdraw vm.warp(block.timestamp + dstTimelocks.withdrawal + 10); vm.expectEmit(); - emit IBaseEscrow.Withdrawal(SECRET); + emit IBaseEscrow.EscrowWithdrawal(SECRET); dstClone.withdraw(SECRET, immutables); assertEq(alice.addr.balance, balanceAlice + TAKING_AMOUNT); @@ -658,7 +658,7 @@ contract EscrowTest is BaseSetup { // withdraw vm.warp(block.timestamp + dstTimelocks.publicWithdrawal + 100); vm.expectEmit(); - emit IBaseEscrow.Withdrawal(SECRET); + emit IBaseEscrow.EscrowWithdrawal(SECRET); IEscrowDst(address(dstClone)).publicWithdraw(SECRET, immutables); assertEq(dai.balanceOf(alice.addr), balanceAlice + TAKING_AMOUNT); @@ -683,7 +683,7 @@ contract EscrowTest is BaseSetup { // withdraw vm.warp(block.timestamp + dstTimelocks.publicWithdrawal + 100); vm.expectEmit(); - emit IBaseEscrow.Withdrawal(SECRET); + emit IBaseEscrow.EscrowWithdrawal(SECRET); dstClone.withdraw(SECRET, immutables); assertEq(dai.balanceOf(alice.addr), balanceAlice + TAKING_AMOUNT);