feat: Directly import OZ to remove interfaces and simplify testing

catalystdao · Feb 2, 2024 · e15dfe9 · e15dfe9
1 parent a123374
commit e15dfe9
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 421 deletions.
diff --git a/remappings.txt b/remappings.txt
@@ -1,2 +1,3 @@
 forge-std/=lib/forge-std/src/
-openzeppelin/=lib/openzeppelin-contracts/contracts/
+openzeppelin/=lib/openzeppelin-contracts/contracts/
+@openzeppelin/=lib/openzeppelin-contracts/
diff --git a/src/apps/layerzero/IncentivizedLayerZeroEscrow.sol b/src/apps/layerzero/IncentivizedLayerZeroEscrow.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: DO-NOT-USE
 pragma solidity ^0.8.13;
 
+import { ILayerZeroEndpointV2, MessagingParams, MessagingFee } from "LayerZero-v2/protocol/contracts/interfaces/ILayerZeroEndpointV2.sol";
+import { PacketV1Codec } from "LayerZero-v2/protocol/contracts/messagelib/libs/PacketV1Codec.sol";
+
 import { IncentivizedMessageEscrow } from "../../IncentivizedMessageEscrow.sol";
-import { ILayerZeroEndpointV2, MessagingParams, MessagingFee } from "./interfaces/ILayerZeroEndpointV2.sol";
-import { PacketV1Codec } from "./libs/PacketV1Codec.sol";
 import { UlnConfig } from "./interfaces/IUlnBase.sol";
 import { IReceiveUlnBase, UlnConfig, Verification } from "./interfaces/IUlnBase.sol";
 

diff --git a/src/apps/layerzero/SimpleLZULN.sol b/src/apps/layerzero/SimpleLZULN.sol
diff --git a/src/apps/layerzero/interfaces/ILayerZeroEndpointV2.sol b/src/apps/layerzero/interfaces/ILayerZeroEndpointV2.sol
diff --git a/src/apps/layerzero/interfaces/IMessageLibManager.sol b/src/apps/layerzero/interfaces/IMessageLibManager.sol
diff --git a/src/apps/layerzero/interfaces/IMessagingChannel.sol b/src/apps/layerzero/interfaces/IMessagingChannel.sol
diff --git a/src/apps/layerzero/interfaces/IMessagingComposer.sol b/src/apps/layerzero/interfaces/IMessagingComposer.sol
diff --git a/src/apps/layerzero/interfaces/IMessagingContext.sol b/src/apps/layerzero/interfaces/IMessagingContext.sol
diff --git a/src/apps/layerzero/interfaces/IPacket.sol b/src/apps/layerzero/interfaces/IPacket.sol
diff --git a/src/apps/layerzero/libs/AddressCast.sol b/src/apps/layerzero/libs/AddressCast.sol