From 8eb89d99b619062c65632c80015f6ef57af71f1c Mon Sep 17 00:00:00 2001 From: Leandro Faria Date: Thu, 12 Dec 2024 21:42:58 -0500 Subject: [PATCH] chore:delete bridging folder --- src/modules/paymentProcessor/PP_Connext_Crosschain_v1.sol | 6 +++--- .../paymentProcessor/abstracts/CrossChainBase_v1.sol | 3 +-- .../{bridging => }/abstracts/CrossChainBase_v1.t.sol | 0 .../{bridging => }/abstracts/CrossChainBase_v1_Exposed.sol | 0 .../{bridging => }/abstracts/Interfaces/IEverClearSpoke.sol | 0 .../abstracts/PP_Connext_Crosschain_v1_Exposed.sol | 2 +- .../abstracts/PP_Connext_Crosschain_v1_Test.t.sol | 6 +++--- .../abstracts/mocks/Mock_EverclearPayment.sol | 0 8 files changed, 8 insertions(+), 9 deletions(-) rename test/modules/paymentProcessor/{bridging => }/abstracts/CrossChainBase_v1.t.sol (100%) rename test/modules/paymentProcessor/{bridging => }/abstracts/CrossChainBase_v1_Exposed.sol (100%) rename test/modules/paymentProcessor/{bridging => }/abstracts/Interfaces/IEverClearSpoke.sol (100%) rename test/modules/paymentProcessor/{bridging => }/abstracts/PP_Connext_Crosschain_v1_Exposed.sol (94%) rename test/modules/paymentProcessor/{bridging => }/abstracts/PP_Connext_Crosschain_v1_Test.t.sol (98%) rename test/modules/paymentProcessor/{bridging => }/abstracts/mocks/Mock_EverclearPayment.sol (100%) diff --git a/src/modules/paymentProcessor/PP_Connext_Crosschain_v1.sol b/src/modules/paymentProcessor/PP_Connext_Crosschain_v1.sol index abe123a28..82e8ad56c 100644 --- a/src/modules/paymentProcessor/PP_Connext_Crosschain_v1.sol +++ b/src/modules/paymentProcessor/PP_Connext_Crosschain_v1.sol @@ -150,7 +150,7 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 { ) external { _validateTransferRequest(client, recipient, pendingIntentId); - bytes32 newIntentId = createCrossChainIntent(order, executionData); + bytes32 newIntentId = _createCrossChainIntent(order, executionData); if (newIntentId == bytes32(0)) { revert Module__PP_Crosschain__MessageDeliveryFailed( 8453, 8453, executionData @@ -189,7 +189,7 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 { bytes memory executionData, address client ) internal returns (bytes memory) { - bytes32 _intentId = createCrossChainIntent(order, executionData); + bytes32 _intentId = _createCrossChainIntent(order, executionData); if (_intentId == bytes32(0)) { failedTransfers[client][order.recipient][_intentId] = order.amount; @@ -208,7 +208,7 @@ contract PP_Connext_Crosschain_v1 is PP_Crosschain_v1 { * @param executionData Additional execution parameters * @return The ID of the created intent */ - function createCrossChainIntent( + function _createCrossChainIntent( IERC20PaymentClientBase_v1.PaymentOrder memory order, bytes memory executionData ) internal returns (bytes32) { diff --git a/src/modules/paymentProcessor/abstracts/CrossChainBase_v1.sol b/src/modules/paymentProcessor/abstracts/CrossChainBase_v1.sol index c4b0723a3..5ab6392ad 100644 --- a/src/modules/paymentProcessor/abstracts/CrossChainBase_v1.sol +++ b/src/modules/paymentProcessor/abstracts/CrossChainBase_v1.sol @@ -14,12 +14,11 @@ import {ICrossChainBase_v1} from "../interfaces/ICrosschainBase_v1.sol"; * @title Cross-chain Base Contract * @notice Abstract base contract providing core cross-chain functionality for payment * processors. - * @dev This contract implements fundamental cross-chain operations and provides: + * @dev This contract exposes fundamental cross-chain operations and provides: * - Bridge data storage and retrieval functionality * - Abstract interface for bridge transfer execution * - Integration with the Module_v1 base contract * - Implementation of ICrossChainBase_v1 interface - * - ERC165 interface support for cross-chain functionality * @custom:security-contact security@inverter.network * In case of any concerns or findings, please refer to our * Security Policy at security.inverter.network or email us diff --git a/test/modules/paymentProcessor/bridging/abstracts/CrossChainBase_v1.t.sol b/test/modules/paymentProcessor/abstracts/CrossChainBase_v1.t.sol similarity index 100% rename from test/modules/paymentProcessor/bridging/abstracts/CrossChainBase_v1.t.sol rename to test/modules/paymentProcessor/abstracts/CrossChainBase_v1.t.sol diff --git a/test/modules/paymentProcessor/bridging/abstracts/CrossChainBase_v1_Exposed.sol b/test/modules/paymentProcessor/abstracts/CrossChainBase_v1_Exposed.sol similarity index 100% rename from test/modules/paymentProcessor/bridging/abstracts/CrossChainBase_v1_Exposed.sol rename to test/modules/paymentProcessor/abstracts/CrossChainBase_v1_Exposed.sol diff --git a/test/modules/paymentProcessor/bridging/abstracts/Interfaces/IEverClearSpoke.sol b/test/modules/paymentProcessor/abstracts/Interfaces/IEverClearSpoke.sol similarity index 100% rename from test/modules/paymentProcessor/bridging/abstracts/Interfaces/IEverClearSpoke.sol rename to test/modules/paymentProcessor/abstracts/Interfaces/IEverClearSpoke.sol diff --git a/test/modules/paymentProcessor/bridging/abstracts/PP_Connext_Crosschain_v1_Exposed.sol b/test/modules/paymentProcessor/abstracts/PP_Connext_Crosschain_v1_Exposed.sol similarity index 94% rename from test/modules/paymentProcessor/bridging/abstracts/PP_Connext_Crosschain_v1_Exposed.sol rename to test/modules/paymentProcessor/abstracts/PP_Connext_Crosschain_v1_Exposed.sol index b0ac06853..f18befe37 100644 --- a/test/modules/paymentProcessor/bridging/abstracts/PP_Connext_Crosschain_v1_Exposed.sol +++ b/test/modules/paymentProcessor/abstracts/PP_Connext_Crosschain_v1_Exposed.sol @@ -20,7 +20,7 @@ contract PP_Connext_Crosschain_v1_Exposed is PP_Connext_Crosschain_v1 { IERC20PaymentClientBase_v1.PaymentOrder memory order, bytes memory executionData ) external returns (bytes32) { - return createCrossChainIntent(order, executionData); + return _createCrossChainIntent(order, executionData); } function exposed_setFailedTransfer( diff --git a/test/modules/paymentProcessor/bridging/abstracts/PP_Connext_Crosschain_v1_Test.t.sol b/test/modules/paymentProcessor/abstracts/PP_Connext_Crosschain_v1_Test.t.sol similarity index 98% rename from test/modules/paymentProcessor/bridging/abstracts/PP_Connext_Crosschain_v1_Test.t.sol rename to test/modules/paymentProcessor/abstracts/PP_Connext_Crosschain_v1_Test.t.sol index b33bb2d45..af7b8c010 100644 --- a/test/modules/paymentProcessor/bridging/abstracts/PP_Connext_Crosschain_v1_Test.t.sol +++ b/test/modules/paymentProcessor/abstracts/PP_Connext_Crosschain_v1_Test.t.sol @@ -13,7 +13,7 @@ import {PP_Connext_Crosschain_v1} from import {CrossChainBase_v1} from "src/modules/paymentProcessor/abstracts/CrossChainBase_v1.sol"; import {CrossChainBase_v1_Exposed} from - "test/modules/paymentProcessor/bridging/abstracts/CrossChainBase_v1_Exposed.sol"; + "test/modules/paymentProcessor/abstracts/CrossChainBase_v1_Exposed.sol"; import {IERC20PaymentClientBase_v1} from "@lm/interfaces/IERC20PaymentClientBase_v1.sol"; import {ICrossChainBase_v1} from @@ -21,10 +21,10 @@ import {ICrossChainBase_v1} from import {IPaymentProcessor_v1} from "src/modules/paymentProcessor/IPaymentProcessor_v1.sol"; import {PP_Connext_Crosschain_v1_Exposed} from - "test/modules/paymentProcessor/bridging/abstracts/PP_Connext_Crosschain_v1_Exposed.sol"; + "test/modules/paymentProcessor/abstracts/PP_Connext_Crosschain_v1_Exposed.sol"; // Tests and Mocks import {Mock_EverclearPayment} from - "test/modules/paymentProcessor/bridging/abstracts/mocks/Mock_EverclearPayment.sol"; + "test/modules/paymentProcessor/abstracts/mocks/Mock_EverclearPayment.sol"; import { IERC20PaymentClientBase_v1, ERC20PaymentClientBaseV1Mock diff --git a/test/modules/paymentProcessor/bridging/abstracts/mocks/Mock_EverclearPayment.sol b/test/modules/paymentProcessor/abstracts/mocks/Mock_EverclearPayment.sol similarity index 100% rename from test/modules/paymentProcessor/bridging/abstracts/mocks/Mock_EverclearPayment.sol rename to test/modules/paymentProcessor/abstracts/mocks/Mock_EverclearPayment.sol