From 4408e5a1fb2df40e8a1780552712bce5062cb41c Mon Sep 17 00:00:00 2001 From: Andrea Franz Date: Fri, 27 Jun 2025 14:56:01 +0200 Subject: [PATCH] chore: rename completeBridge to completeBridging --- contracts/src/bridging/eth/L1ETHBridge.sol | 4 ++-- contracts/src/bridging/eth/L2ETHBridge.sol | 5 +++-- .../src/bridging/eth/interfaces/IL1ETHBridge.sol | 2 +- .../src/bridging/eth/interfaces/IL2ETHBridge.sol | 2 +- .../test/foundry/bridging/eth/L1ETHBridge.t.sol | 14 +++++++------- .../test/foundry/bridging/eth/L2ETHBridge.t.sol | 14 +++++++------- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/contracts/src/bridging/eth/L1ETHBridge.sol b/contracts/src/bridging/eth/L1ETHBridge.sol index 9bd73dc7..16f5b0af 100644 --- a/contracts/src/bridging/eth/L1ETHBridge.sol +++ b/contracts/src/bridging/eth/L1ETHBridge.sol @@ -112,7 +112,7 @@ contract L1ETHBridge is IL1ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg * @param _value The amount of ETH to transfer. * @param _calldata The calldata to pass to the recipient. */ - function completeBridge( + function completeBridging( address _to, uint256 _value, bytes memory _calldata @@ -137,7 +137,7 @@ contract L1ETHBridge is IL1ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg revert L1ETHBridge__YieldManagerDepositFailed(); } - bytes memory data = abi.encodeWithSelector(IL2ETHBridge.completeBridge.selector, _to, msg.value, _calldata); + bytes memory data = abi.encodeWithSelector(IL2ETHBridge.completeBridging.selector, _to, msg.value, _calldata); messageService.sendMessage(remoteSender, 0, data); } diff --git a/contracts/src/bridging/eth/L2ETHBridge.sol b/contracts/src/bridging/eth/L2ETHBridge.sol index b5b6bf3f..b6d32c0d 100644 --- a/contracts/src/bridging/eth/L2ETHBridge.sol +++ b/contracts/src/bridging/eth/L2ETHBridge.sol @@ -5,6 +5,7 @@ import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/I import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; +import { IL1ETHBridge } from "./interfaces/IL1ETHBridge.sol"; import { IL2ETHBridge } from "./interfaces/IL2ETHBridge.sol"; import { MessageServiceBase } from "../../messaging/MessageServiceBase.sol"; import { IMessageService } from "../../messaging/interfaces/IMessageService.sol"; @@ -73,7 +74,7 @@ contract L2ETHBridge is IL2ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg * @param _value The amount of ETH to transfer. * @param _calldata The calldata to pass to the recipient. */ - function completeBridge( + function completeBridging( address _to, uint256 _value, bytes memory _calldata @@ -93,7 +94,7 @@ contract L2ETHBridge is IL2ETHBridge, Initializable, UUPSUpgradeable, OwnableUpg address _to, bytes memory _calldata ) external payable nonZeroAmount(msg.value) nonZeroAddress(_to) { - bytes memory data = abi.encodeWithSelector(IL2ETHBridge.completeBridge.selector, _to, msg.value, _calldata); + bytes memory data = abi.encodeWithSelector(IL1ETHBridge.completeBridging.selector, _to, msg.value, _calldata); messageService.sendMessage(remoteSender, 0, data); } diff --git a/contracts/src/bridging/eth/interfaces/IL1ETHBridge.sol b/contracts/src/bridging/eth/interfaces/IL1ETHBridge.sol index 165b67c3..532b9fb0 100644 --- a/contracts/src/bridging/eth/interfaces/IL1ETHBridge.sol +++ b/contracts/src/bridging/eth/interfaces/IL1ETHBridge.sol @@ -43,5 +43,5 @@ interface IL1ETHBridge { function bridgeETH(address _to, bytes memory _calldata) external payable; - function completeBridge(address _to, uint256 _value, bytes calldata _calldata) external; + function completeBridging(address _to, uint256 _value, bytes calldata _calldata) external; } diff --git a/contracts/src/bridging/eth/interfaces/IL2ETHBridge.sol b/contracts/src/bridging/eth/interfaces/IL2ETHBridge.sol index 17916555..1d3d7cc1 100644 --- a/contracts/src/bridging/eth/interfaces/IL2ETHBridge.sol +++ b/contracts/src/bridging/eth/interfaces/IL2ETHBridge.sol @@ -22,5 +22,5 @@ interface IL2ETHBridge { function setMessageService(address _messageService) external; - function completeBridge(address _to, uint256 _value, bytes calldata _calldata) external; + function completeBridging(address _to, uint256 _value, bytes calldata _calldata) external; } diff --git a/contracts/test/foundry/bridging/eth/L1ETHBridge.t.sol b/contracts/test/foundry/bridging/eth/L1ETHBridge.t.sol index b9c809f7..4006d763 100644 --- a/contracts/test/foundry/bridging/eth/L1ETHBridge.t.sol +++ b/contracts/test/foundry/bridging/eth/L1ETHBridge.t.sol @@ -115,7 +115,7 @@ contract L1ETHBridgeTest is Test { assertEq(messageService.messagesLength(), 1); bytes memory expectedData = abi.encodeWithSelector( - IL2ETHBridge.completeBridge.selector, + IL2ETHBridge.completeBridging.selector, user2, 100, "test-message" @@ -128,25 +128,25 @@ contract L1ETHBridgeTest is Test { assertEq(message.data, expectedData); } - function test_CompleteBridgeRevertsIfMsgSenderIsNotL2MessageService() public { + function test_CompleteBridgingRevertsIfMsgSenderIsNotL2MessageService() public { vm.prank(nonAuthorizedSender); vm.expectRevert("CallerIsNotMessageService()"); - bridge.completeBridge(user1, 0, ""); + bridge.completeBridging(user1, 0, ""); } - function test_CompleteBridgeRevertsIfRemoteSenderIsNotL2ETHBridge() public { + function test_CompleteBridgingRevertsIfRemoteSenderIsNotL2ETHBridge() public { messageService.setOriginalSender(nonAuthorizedSender); vm.prank(address(messageService)); vm.expectRevert("SenderNotAuthorized()"); - bridge.completeBridge(user1, 0, ""); + bridge.completeBridging(user1, 0, ""); } - function test_CompleteBridge() public { + function test_CompleteBridging() public { assertEq(bridge.nextCompletedMessageId(), 0); messageService.setOriginalSender(remoteSender); vm.prank(address(messageService)); - bridge.completeBridge(user1, 100, "test-data"); + bridge.completeBridging(user1, 100, "test-data"); assertEq(bridge.nextCompletedMessageId(), 1); (address to, uint256 value, bytes memory callData) = bridge.completedMessages(0); diff --git a/contracts/test/foundry/bridging/eth/L2ETHBridge.t.sol b/contracts/test/foundry/bridging/eth/L2ETHBridge.t.sol index b977001f..12ab1cf0 100644 --- a/contracts/test/foundry/bridging/eth/L2ETHBridge.t.sol +++ b/contracts/test/foundry/bridging/eth/L2ETHBridge.t.sol @@ -68,21 +68,21 @@ contract L2ETHBridgeTest is Test { assertEq(bridge.remoteSender(), newRemoteSender); } - function test_CompleteBridgeRevertsIfMsgSenderIsNotL2MessageService() public { + function test_CompleteBridgingRevertsIfMsgSenderIsNotL2MessageService() public { vm.prank(nonAuthorizedSender); vm.expectRevert("CallerIsNotMessageService()"); - bridge.completeBridge(l1ETHBridge, 0, ""); + bridge.completeBridging(l1ETHBridge, 0, ""); } - function test_CompleteBridgeRevertsIfRemoteSenderIsNotL1ETHBridge() public { + function test_CompleteBridgingRevertsIfRemoteSenderIsNotL1ETHBridge() public { l2MessageService.setOriginalSender(nonAuthorizedSender); vm.prank(address(l2MessageService)); vm.expectRevert("SenderNotAuthorized()"); - bridge.completeBridge(user1, 0, ""); + bridge.completeBridging(user1, 0, ""); } - function test_CompleteBridge() public { + function test_CompleteBridging() public { l2MessageService.setOriginalSender(l1ETHBridge); assertEq(recipientMock.lastCallParam(), 0); @@ -90,7 +90,7 @@ contract L2ETHBridgeTest is Test { vm.prank(address(l2MessageService)); bytes memory data = abi.encodeWithSelector(RecipientMock.foo.selector, 77); - bridge.completeBridge(address(recipientMock), 100, data); + bridge.completeBridging(address(recipientMock), 100, data); assertEq(recipientMock.lastCallParam(), 77); assertEq(address(recipientMock).balance, 100); @@ -114,7 +114,7 @@ contract L2ETHBridgeTest is Test { assertEq(l2MessageService.messagesLength(), 1); bytes memory expectedData = abi.encodeWithSelector( - IL1ETHBridge.completeBridge.selector, + IL1ETHBridge.completeBridging.selector, user2, 100, "test-message"