chore: move L1ETHBridge and L2ETHBridge to src/bridging/eth

This commit is contained in:
Andrea Franz
2025-06-26 10:42:06 +02:00
parent f49b1b2855
commit ba08cb9e91
15 changed files with 9 additions and 11 deletions

View File

@@ -5,7 +5,7 @@ import { BaseScript } from "../Base.s.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { DeploymentConfig } from "./DeploymentConfig.s.sol";
import { L1ETHBridge } from "../../../../src/yield/bridge/L1ETHBridge.sol";
import { L1ETHBridge } from "../../../../src/bridging/eth/L1ETHBridge.sol";
contract DeployL1ETHBridge is BaseScript {
function run() public returns (address, L1ETHBridge) {

View File

@@ -2,8 +2,8 @@
pragma solidity ^0.8.19;
import { Script } from "forge-std/Script.sol";
import { ETHYieldManagerMock } from "../../../../test/foundry/yield/bridge/mocks/ETHYieldManagerMock.sol";
import { RollupMock } from "../../../../test/foundry/yield/bridge/mocks/RollupMock.sol";
import { ETHYieldManagerMock } from "../../../../test/foundry/bridging/eth/mocks/ETHYieldManagerMock.sol";
import { RollupMock } from "../../../../test/foundry/bridging/eth/mocks/RollupMock.sol";
contract DeploymentConfig is Script {
error DeploymentConfig_InvalidDeployerAddress();

View File

@@ -5,7 +5,7 @@ import { BaseScript } from "../Base.s.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { DeploymentConfig } from "./DeploymentConfig.s.sol";
import { L2ETHBridge } from "../../../../src/yield/bridge/L2ETHBridge.sol";
import { L2ETHBridge } from "../../../../src/bridging/eth/L2ETHBridge.sol";
contract DeployL2ETHBridge is BaseScript {
function run() public returns (address, L2ETHBridge) {

View File

@@ -2,7 +2,7 @@
pragma solidity ^0.8.26;
import { Script } from "forge-std/Script.sol";
import { L2MessageServiceMock } from "../../../../test/foundry/yield/bridge/mocks/L2MessageServiceMock.sol";
import { L2MessageServiceMock } from "../../../../test/foundry/bridging/eth/mocks/L2MessageServiceMock.sol";
contract DeploymentConfig is Script {
error DeploymentConfig_InvalidDeployerAddress();

View File

@@ -2,9 +2,9 @@
pragma solidity ^0.8.30;
import { Test } from "forge-std/Test.sol";
import { L1ETHBridge } from "../../../../src/yield/bridge/L1ETHBridge.sol";
import { L1ETHBridge } from "../../../../src/bridging/eth/L1ETHBridge.sol";
import { DeployL1ETHBridge } from "../../../../scripts/yield/bridge/l1/DeployL1ETHBridge.s.sol";
import { IL2ETHBridge } from "../../../../src/yield/bridge/interfaces/IL2ETHBridge.sol";
import { IL2ETHBridge } from "../../../../src/bridging/eth/interfaces/IL2ETHBridge.sol";
import { RollupMock } from "./mocks/RollupMock.sol";
import { ETHYieldManagerMock } from "./mocks/ETHYieldManagerMock.sol";

View File

@@ -2,7 +2,7 @@
pragma solidity ^0.8.30;
import { Test, console } from "forge-std/Test.sol";
import { L2ETHBridge } from "../../../../src/yield/bridge/L2ETHBridge.sol";
import { L2ETHBridge } from "../../../../src/bridging/eth/L2ETHBridge.sol";
import { DeployL2ETHBridge } from "../../../../scripts/yield/bridge/l2/DeployL2ETHBridge.s.sol";
import { RecipientMock } from "./mocks/RecipientMock.sol";
import { L2MessageServiceMock } from "./mocks/L2MessageServiceMock.sol";

View File

@@ -1,9 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.30;
import { IRollup } from "../../../../../src/yield/bridge/interfaces/IRollup.sol";
contract RollupMock is IRollup {
contract RollupMock {
struct Message {
address to;
uint256 fee;