refactor: Adapt contracts file tree

.solcover.js

@@ -21,7 +21,7 @@ module.exports = {
         'tools/testing/ERC1271Mock.sol',
         'tools/testing/TestClient.sol',
         'tools/testing/TestReceiver.sol',
-        'modules/facets/SignatureVerifier.sol',
+        'facets/SignatureVerifier.sol',
     ],
     istanbulFolder: BASE_FOLDER,
 };

contracts/modules/FacetBase.sol → contracts/facets/FacetBase.sol

@@ -4,12 +4,16 @@
 pragma solidity ^0.6.0;
 
 import "../Store.sol";
-import "./interfaces/IOwnable.sol";
+import "../interfaces/IOwnable.sol";
 
 // Functions that were declared in ERC1538Store are re-declared here.
 // TODO clean this (use LibDiamond)
 //      - All calls to `owner()` should use `LibDiamond.contractOwner()`.
 
+/**
+ * @title Base contract of all Facet contracts.
+ * @dev Every facet must inherit from this contract.
+ */
 abstract contract FacetBase is Store {
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");

contracts/modules/FacetBase.v8.sol → contracts/facets/FacetBase.v8.sol

@@ -12,7 +12,7 @@ import {Store} from "../Store.v8.sol";
 
 /**
  * @title Base contract of all Facet contracts.
- * @dev Every module must inherit from this contract.
+ * @dev Every facet must inherit from this contract.
  */
 abstract contract FacetBase is Store {
     modifier onlyOwner() {

contracts/modules/facets/IexecAccessorsABILegacyFacet.sol → contracts/facets/IexecAccessorsABILegacyFacet.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecAccessorsABILegacy.sol";
 
 contract IexecAccessorsABILegacyFacet is IexecAccessorsABILegacy, FacetBase {

contracts/modules/facets/IexecAccessorsFacet.sol → contracts/facets/IexecAccessorsFacet.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecAccessors.sol";
 
 contract IexecAccessorsFacet is IexecAccessors, FacetBase {

contracts/modules/facets/IexecCategoryManagerFacet.sol → contracts/facets/IexecCategoryManagerFacet.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecCategoryManager.sol";
 
 contract IexecCategoryManagerFacet is IexecCategoryManager, FacetBase {

contracts/modules/facets/IexecConfigurationExtraFacet.sol → contracts/facets/IexecConfigurationExtraFacet.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecConfigurationExtra.sol";
 
 contract IexecConfigurationExtraFacet is IexecConfigurationExtra, FacetBase {

contracts/modules/facets/IexecConfigurationFacet.sol → contracts/facets/IexecConfigurationFacet.sol

@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecConfiguration.sol";
 
 contract IexecConfigurationFacet is IexecConfiguration, FacetBase {

contracts/modules/facets/IexecERC20Core.sol → contracts/facets/IexecERC20Core.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 
 contract IexecERC20Core is FacetBase {
     using SafeMathExtended for uint256;

contracts/modules/facets/IexecERC20Facet.sol → contracts/facets/IexecERC20Facet.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecERC20.sol";
 import "../interfaces/IexecTokenSpender.sol";
 

contracts/modules/facets/IexecEscrow.v8.sol → contracts/facets/IexecEscrow.v8.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.0;
 
-import {FacetBase} from "../FacetBase.v8.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 
 /**
  * @title Manage (lock/unlock/reward/seize) user funds.

contracts/modules/facets/IexecEscrowNativeFacet.sol → contracts/facets/IexecEscrowNativeFacet.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecEscrowNative.sol";
 
 contract IexecEscrowNativeFacet is IexecEscrowNative, FacetBase, IexecERC20Core {

contracts/modules/facets/IexecEscrowTokenFacet.sol → contracts/facets/IexecEscrowTokenFacet.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecEscrowToken.sol";
 import "../interfaces/IexecTokenSpender.sol";
 

contracts/modules/facets/IexecEscrowTokenSwapFacet.sol → contracts/facets/IexecEscrowTokenSwapFacet.sol

@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
 import "./SignatureVerifier.sol";
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecEscrowTokenSwap.sol";
 import "../interfaces/IexecPoco1.sol";
 

contracts/modules/facets/IexecOrderManagementFacet.sol → contracts/facets/IexecOrderManagementFacet.sol

@@ -5,9 +5,9 @@ pragma solidity ^0.8.0;
 
 import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol";
 import {SignatureVerifier} from "./SignatureVerifier.v8.sol";
-import {FacetBase} from "../FacetBase.v8.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.v8.sol";
-import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol";
+import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 
 contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase, SignatureVerifier {
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;

contracts/modules/facets/IexecPoco1Facet.sol → contracts/facets/IexecPoco1Facet.sol

@@ -6,10 +6,10 @@ pragma solidity ^0.8.0;
 import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol";
 import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol";
 
-import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol";
-import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol";
-import {IWorkerpool} from "../../registries/workerpools/IWorkerpool.v8.sol";
-import {FacetBase} from "../FacetBase.v8.sol";
+import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
+import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
+import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.v8.sol";
 import {IexecEscrow} from "./IexecEscrow.v8.sol";
 import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol";

contracts/modules/facets/IexecPoco2Facet.sol → contracts/facets/IexecPoco2Facet.sol

@@ -4,10 +4,10 @@
 pragma solidity ^0.8.0;
 
 import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol";
-import {IOracleConsumer} from "../../external/interfaces/IOracleConsumer.sol";
-import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol";
-import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol";
-import {FacetBase} from "../FacetBase.v8.sol";
+import {IOracleConsumer} from "../external/interfaces/IOracleConsumer.sol";
+import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
+import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 import {IexecPoco2} from "../interfaces/IexecPoco2.v8.sol";
 import {IexecEscrow} from "./IexecEscrow.v8.sol";
 import {SignatureVerifier} from "./SignatureVerifier.v8.sol";

contracts/modules/facets/IexecPocoAccessorsFacet.sol → contracts/facets/IexecPocoAccessorsFacet.sol

@@ -3,15 +3,15 @@
 
 pragma solidity ^0.8.0;
 
-import {FacetBase} from "../FacetBase.v8.sol";
-import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol";
-import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
+import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
+import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IexecPocoAccessors} from "../interfaces/IexecPocoAccessors.sol";
 import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol";
 import {SignatureVerifier} from "./SignatureVerifier.v8.sol";
 
 /**
- * @title Getters contract for PoCo module.
+ * @title Getters contract for PoCo facets.
  */
 contract IexecPocoAccessorsFacet is
     IexecPocoAccessors,
@@ -25,7 +25,7 @@ contract IexecPocoAccessorsFacet is
     using IexecLibOrders_v5 for IexecLibOrders_v5.RequestOrder;
 
     /**
-     * Get a deal created by PoCo module.
+     * Get a deal created by PoCo classic facet.
      * @param id The ID of the deal.
      */
     function viewDeal(bytes32 id) external view returns (IexecLibCore_v5.Deal memory deal) {

contracts/modules/facets/IexecPocoBoostAccessorsFacet.sol → contracts/facets/IexecPocoBoostAccessorsFacet.sol

@@ -3,17 +3,17 @@
 
 pragma solidity ^0.8.0;
 
-import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol";
-import {FacetBase} from "../FacetBase.v8.sol";
+import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 import {IexecPocoBoostAccessors} from "../interfaces/IexecPocoBoostAccessors.sol";
 
 /**
- * @title Getters contract for PoCo Boost module.
+ * @title Getters contract for PoCo Boost facet.
  * @notice Access to PoCo Boost tasks must be done with PoCo Classic `IexecAccessors`.
  */
 contract IexecPocoBoostAccessorsFacet is IexecPocoBoostAccessors, FacetBase {
     /**
-     * Get a deal created by PoCo Boost module.
+     * Get a deal created by PoCo Boost facet.
      * @param id The ID of the deal.
      */
     function viewDealBoost(

contracts/modules/facets/IexecPocoBoostFacet.sol → contracts/facets/IexecPocoBoostFacet.sol

@@ -9,11 +9,11 @@ import {MessageHashUtils} from "@openzeppelin/contracts-v5/utils/cryptography/Me
 import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol";
 import {SafeCast} from "@openzeppelin/contracts-v5/utils/math/SafeCast.sol";
 
-import {IOracleConsumer} from "../../external/interfaces/IOracleConsumer.sol";
-import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol";
-import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol";
-import {IWorkerpool} from "../../registries/workerpools/IWorkerpool.v8.sol";
-import {FacetBase} from "../FacetBase.v8.sol";
+import {IOracleConsumer} from "../external/interfaces/IOracleConsumer.sol";
+import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
+import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
+import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol";
 import {IexecEscrow} from "./IexecEscrow.v8.sol";
 import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol";

contracts/modules/facets/IexecPocoCommonFacet.sol → contracts/facets/IexecPocoCommonFacet.sol

@@ -5,8 +5,8 @@ pragma solidity ^0.8.0;
 
 import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol";
 
-import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol";
-import {FacetBase} from "../FacetBase.v8.sol";
+import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 
 contract IexecPocoCommonFacet is FacetBase {
     using Math for uint256;

contracts/modules/facets/IexecRelayFacet.sol → contracts/facets/IexecRelayFacet.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecRelay.sol";
 
 contract IexecRelayFacet is IexecRelay, FacetBase {

contracts/modules/facets/SignatureVerifier.sol → contracts/facets/SignatureVerifier.sol

@@ -7,7 +7,7 @@ pragma experimental ABIEncoderV2;
 import "@iexec/solidity/contracts/ERC734/IERC734.sol";
 import "@iexec/solidity/contracts/ERC1271/IERC1271.sol";
 import "@iexec/solidity/contracts/ERC1654/IERC1654.sol";
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 
 contract SignatureVerifier is FacetBase {
     /**

contracts/modules/facets/SignatureVerifier.v8.sol → contracts/facets/SignatureVerifier.v8.sol

@@ -6,8 +6,8 @@ pragma solidity ^0.8.0;
 import {IERC1271} from "@openzeppelin/contracts-v5/interfaces/IERC1271.sol";
 import {ECDSA} from "@openzeppelin/contracts-v5/utils/cryptography/ECDSA.sol";
 import {MessageHashUtils} from "@openzeppelin/contracts-v5/utils/cryptography/MessageHashUtils.sol";
-import {IERC734} from "../../external/interfaces/IERC734.sol";
-import {FacetBase} from "../FacetBase.v8.sol";
+import {IERC734} from "../external/interfaces/IERC734.sol";
+import {FacetBase} from "./FacetBase.v8.sol";
 
 contract SignatureVerifier is FacetBase {
     using ECDSA for bytes32;