feat: rename-part-3

.solcover.js

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

contracts/IexecInterfaceNative.sol

@@ -24,7 +24,7 @@ import "./modules/interfaces/IexecAccessors.sol";
 import "./modules/interfaces/IexecCategoryManager.sol";
 import "./modules/interfaces/IexecERC20.sol";
 import "./modules/interfaces/IexecEscrowNative.sol";
-import "./modules/interfaces/IexecMaintenance.sol";
+import "./modules/interfaces/IexecConfiguration.sol";
 import "./modules/interfaces/IexecOrderManagement.sol";
 import "./modules/interfaces/IexecPoco1.sol";
 import "./modules/interfaces/IexecPoco2.sol";
@@ -37,7 +37,7 @@ interface IexecInterfaceNative is
     IexecCategoryManager,
     IexecERC20,
     IexecEscrowNative,
-    IexecMaintenance,
+    IexecConfiguration,
     IexecOrderManagement,
     IexecPoco1,
     IexecPoco2,

contracts/IexecInterfaceNativeABILegacy.sol

@@ -25,7 +25,7 @@ import "./modules/interfaces/IexecAccessorsABILegacy.sol";
 import "./modules/interfaces/IexecCategoryManager.sol";
 import "./modules/interfaces/IexecERC20.sol";
 import "./modules/interfaces/IexecEscrowNative.sol";
-import "./modules/interfaces/IexecMaintenance.sol";
+import "./modules/interfaces/IexecConfiguration.sol";
 import "./modules/interfaces/IexecOrderManagement.sol";
 import "./modules/interfaces/IexecPoco1.sol";
 import "./modules/interfaces/IexecPoco2.sol";
@@ -39,7 +39,7 @@ interface IexecInterfaceNativeABILegacy is
     IexecCategoryManager,
     IexecERC20,
     IexecEscrowNative,
-    IexecMaintenance,
+    IexecConfiguration,
     IexecOrderManagement,
     IexecPoco1,
     IexecPoco2,

contracts/IexecInterfaceToken.sol

@@ -25,7 +25,7 @@ import "./modules/interfaces/IexecCategoryManager.sol";
 import "./modules/interfaces/IexecERC20.sol";
 import "./modules/interfaces/IexecEscrowToken.sol";
 import "./modules/interfaces/IexecEscrowTokenSwap.sol";
-import "./modules/interfaces/IexecMaintenance.sol";
+import "./modules/interfaces/IexecConfiguration.sol";
 import "./modules/interfaces/IexecOrderManagement.sol";
 import "./modules/interfaces/IexecPoco1.sol";
 import "./modules/interfaces/IexecPoco2.sol";
@@ -39,7 +39,7 @@ interface IexecInterfaceToken is
     IexecERC20,
     IexecEscrowToken,
     IexecEscrowTokenSwap,
-    IexecMaintenance,
+    IexecConfiguration,
     IexecOrderManagement,
     IexecPoco1,
     IexecPoco2,

contracts/IexecInterfaceTokenABILegacy.sol

@@ -26,7 +26,7 @@ import "./modules/interfaces/IexecCategoryManager.sol";
 import "./modules/interfaces/IexecERC20.sol";
 import "./modules/interfaces/IexecEscrowToken.sol";
 import "./modules/interfaces/IexecEscrowTokenSwap.sol";
-import "./modules/interfaces/IexecMaintenance.sol";
+import "./modules/interfaces/IexecConfiguration.sol";
 import "./modules/interfaces/IexecOrderManagement.sol";
 import "./modules/interfaces/IexecPoco1.sol";
 import "./modules/interfaces/IexecPoco2.sol";
@@ -41,7 +41,7 @@ interface IexecInterfaceTokenABILegacy is
     IexecERC20,
     IexecEscrowToken,
     IexecEscrowTokenSwap,
-    IexecMaintenance,
+    IexecConfiguration,
     IexecOrderManagement,
     IexecPoco1,
     IexecPoco2,

contracts/Store.v8.sol

@@ -92,7 +92,7 @@ abstract contract Store {
     /**
      * @dev EIP-712 domain hash.
      */
-    // Modified in IexecMaintenanceFacet.updateDomainSeparator
+    // Modified in IexecConfigurationFacet.updateDomainSeparator
     //slither-disable-next-line constable-states
     bytes32 internal EIP712DOMAIN_SEPARATOR;
 
@@ -125,14 +125,14 @@ abstract contract Store {
     /**
      * @dev Address of a trusted TEE authority that manages enclave challenges.
      */
-    // Modified in IexecMaintenanceFacet.setTeeBroker
+    // Modified in IexecConfigurationFacet.setTeeBroker
     //slither-disable-next-line constable-states
     address internal m_teebroker;
 
     /**
      * @dev Max amount of gas to be used with callbacks.
      */
-    // Modified in IexecMaintenanceFacet.setCallbackGas
+    // Modified in IexecConfigurationFacet.setCallbackGas
     //slither-disable-next-line constable-states
     uint256 internal m_callbackgas;
 
@@ -142,7 +142,7 @@ abstract contract Store {
     IexecLibCore_v5.Category[] internal m_categories;
 
     // Backward compatibility
-    // Modified in IexecMaintenanceFacet.configure
+    // Modified in IexecConfigurationFacet.configure
     //slither-disable-next-line constable-states
     address internal m_v3_iexecHub; // IexecHubInterface
     mapping(address => bool) internal m_v3_scoreImported;

contracts/modules/FacetBase.sol → contracts/modules/BaseFacet.sol

@@ -10,7 +10,7 @@ import "./interfaces/IOwnable.sol";
 // TODO clean this (use LibDiamond)
 //      - All calls to `owner()` should use `LibDiamond.contractOwner()`.
 
-abstract contract FacetBase is Store {
+abstract contract BaseFacet is Store {
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");
         _;

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

@@ -14,7 +14,7 @@ import {Store} from "../Store.v8.sol";
  * @title Base contract of all Facet contracts.
  * @dev Every module must inherit from this contract.
  */
-abstract contract FacetBase is Store {
+abstract contract BaseFacet is Store {
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");
         _;

contracts/modules/facets/IexecAccessorsABILegacyFacet.sol

@@ -19,10 +19,10 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "../BaseFacet.sol";
 import "../interfaces/IexecAccessorsABILegacy.sol";
 
-contract IexecAccessorsABILegacyFacet is IexecAccessorsABILegacy, FacetBase {
+contract IexecAccessorsABILegacyFacet is IexecAccessorsABILegacy, BaseFacet {
     function viewDealABILegacy_pt1(
         bytes32 _id
     )

contracts/modules/facets/IexecAccessorsFacet.sol

@@ -19,10 +19,10 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "../BaseFacet.sol";
 import "../interfaces/IexecAccessors.sol";
 
-contract IexecAccessorsFacet is IexecAccessors, FacetBase {
+contract IexecAccessorsFacet is IexecAccessors, BaseFacet {
     function name() external view override returns (string memory) {
         return m_name;
     }

contracts/modules/facets/IexecCategoryManagerFacet.sol

@@ -19,10 +19,10 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "../BaseFacet.sol";
 import "../interfaces/IexecCategoryManager.sol";
 
-contract IexecCategoryManagerFacet is IexecCategoryManager, FacetBase {
+contract IexecCategoryManagerFacet is IexecCategoryManager, BaseFacet {
     /**
      * Methods
      */

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

@@ -19,10 +19,10 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
-import "../interfaces/IexecMaintenanceExtra.sol";
+import "../BaseFacet.sol";
+import "../interfaces/IexecConfigurationExtra.sol";
 
-contract IexecMaintenanceExtraFacet is IexecMaintenanceExtra, FacetBase {
+contract IexecConfigurationExtraFacet is IexecConfigurationExtra, BaseFacet {
     function changeRegistries(
         address _appregistryAddress,
         address _datasetregistryAddress,

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

@@ -6,10 +6,10 @@ pragma experimental ABIEncoderV2;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import "../FacetBase.sol";
-import "../interfaces/IexecMaintenance.sol";
+import "../BaseFacet.sol";
+import "../interfaces/IexecConfiguration.sol";
 
-contract IexecMaintenanceFacet is IexecMaintenance, FacetBase {
+contract IexecConfigurationFacet is IexecConfiguration, BaseFacet {
     using SafeMathExtended for uint256;
     using IexecLibOrders_v5 for IexecLibOrders_v5.EIP712Domain;
 

contracts/modules/facets/IexecERC20Core.sol

@@ -4,9 +4,9 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "../BaseFacet.sol";
 
-contract IexecERC20Core is FacetBase {
+contract IexecERC20Core is BaseFacet {
     using SafeMathExtended for uint256;
 
     event Transfer(address indexed from, address indexed to, uint256 value);

contracts/modules/facets/IexecERC20Facet.sol

@@ -20,11 +20,11 @@ pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
-import "../FacetBase.sol";
+import "../BaseFacet.sol";
 import "../interfaces/IexecERC20.sol";
 import "../interfaces/IexecTokenSpender.sol";
 
-contract IexecERC20Facet is IexecERC20, FacetBase, IexecERC20Core {
+contract IexecERC20Facet is IexecERC20, BaseFacet, IexecERC20Core {
     function transfer(address recipient, uint256 amount) external override returns (bool) {
         _transfer(_msgSender(), recipient, amount);
         return true;

contracts/modules/facets/IexecEscrow.v8.sol

@@ -3,12 +3,12 @@
 
 pragma solidity ^0.8.0;
 
-import {FacetBase} from "../FacetBase.v8.sol";
+import {BaseFacet} from "../BaseFacet.v8.sol";
 
 /**
  * @title Manage (lock/unlock/reward/seize) user funds.
  */
-contract IexecEscrow is FacetBase {
+contract IexecEscrow is BaseFacet {
     event Transfer(address indexed from, address indexed to, uint256 value);
     event Lock(address owner, uint256 amount);
     event Unlock(address owner, uint256 amount);

contracts/modules/facets/IexecEscrowNativeFacet.sol

@@ -20,10 +20,10 @@ pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
-import "../FacetBase.sol";
+import "../BaseFacet.sol";
 import "../interfaces/IexecEscrowNative.sol";
 
-contract IexecEscrowNativeFacet is IexecEscrowNative, FacetBase, IexecERC20Core {
+contract IexecEscrowNativeFacet is IexecEscrowNative, BaseFacet, IexecERC20Core {
     using SafeMathExtended for uint256;
 
     uint256 internal constant nRLCtoWei = 10 ** 9;

contracts/modules/facets/IexecEscrowTokenFacet.sol

@@ -20,11 +20,11 @@ pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
-import "../FacetBase.sol";
+import "../BaseFacet.sol";
 import "../interfaces/IexecEscrowToken.sol";
 import "../interfaces/IexecTokenSpender.sol";
 
-contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase, IexecERC20Core {
+contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, BaseFacet, IexecERC20Core {
     using SafeMathExtended for uint256;
 
     /***************************************************************************

contracts/modules/facets/IexecEscrowTokenSwapFacet.sol

@@ -20,16 +20,16 @@ pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
 import "./IexecERC20Core.sol";
-import "./SignatureVerifier.sol";
-import "../FacetBase.sol";
+import "./SignatureVerifierFacet.sol";
+import "../BaseFacet.sol";
 import "../interfaces/IexecEscrowTokenSwap.sol";
 import "../interfaces/IexecPoco1.sol";
 
 contract IexecEscrowTokenSwapFacet is
     IexecEscrowTokenSwap,
-    FacetBase,
+    BaseFacet,
     IexecERC20Core,
-    SignatureVerifier
+    SignatureVerifierFacet
 {
     using SafeMathExtended for uint256;
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;

contracts/modules/facets/IexecOrderManagementFacet.sol

@@ -4,12 +4,12 @@
 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 {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol";
+import {BaseFacet} from "../BaseFacet.v8.sol";
 import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.v8.sol";
 import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol";
 
-contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase, SignatureVerifier {
+contract IexecOrderManagementFacet is IexecOrderManagement, BaseFacet, SignatureVerifierFacet {
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder;

contracts/modules/facets/IexecPoco1Facet.sol

@@ -9,11 +9,11 @@ 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 {BaseFacet} from "../BaseFacet.v8.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.v8.sol";
 import {IexecEscrow} from "./IexecEscrow.v8.sol";
 import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol";
-import {SignatureVerifier} from "./SignatureVerifier.v8.sol";
+import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol";
 
 struct Matching {
     bytes32 apporderHash;
@@ -28,9 +28,9 @@ struct Matching {
 
 contract IexecPoco1Facet is
     IexecPoco1,
-    FacetBase,
+    BaseFacet,
     IexecEscrow,
-    SignatureVerifier,
+    SignatureVerifierFacet,
     IexecPocoCommonFacet
 {
     using Math for uint256;

contracts/modules/facets/IexecPoco2Facet.sol

@@ -7,14 +7,14 @@ 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 {BaseFacet} from "../BaseFacet.v8.sol";
 import {IexecPoco2} from "../interfaces/IexecPoco2.v8.sol";
 import {IexecEscrow} from "./IexecEscrow.v8.sol";
-import {SignatureVerifier} from "./SignatureVerifier.v8.sol";
+import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol";
 
 // TODO: Revert with custom errors
 
-contract IexecPoco2Facet is IexecPoco2, FacetBase, IexecEscrow, SignatureVerifier {
+contract IexecPoco2Facet is IexecPoco2, BaseFacet, IexecEscrow, SignatureVerifierFacet {
     modifier onlyScheduler(bytes32 _taskId) {
         require(_msgSender() == m_deals[m_tasks[_taskId].dealid].workerpool.owner);
         _;

contracts/modules/facets/IexecPocoAccessorsFacet.sol

@@ -3,20 +3,20 @@
 
 pragma solidity ^0.8.0;
 
-import {FacetBase} from "../FacetBase.v8.sol";
+import {BaseFacet} from "../BaseFacet.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";
+import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol";
 
 /**
  * @title Getters contract for PoCo module.
  */
 contract IexecPocoAccessorsFacet is
     IexecPocoAccessors,
-    FacetBase,
-    SignatureVerifier,
+    BaseFacet,
+    SignatureVerifierFacet,
     IexecPocoCommonFacet
 {
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;

contracts/modules/facets/IexecPocoBoostAccessorsFacet.sol

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