chore: Clean contracts and tests - part1 (#330)

Author: zguesmi

.github/workflows/main.yml

@@ -27,9 +27,9 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Check code formatting
-        run: npm run check-format
+        run: npm run format:check
       - name: Check documentation is up-to-date
-        run: npm run check-doc
+        run: npm run doc:check
       - name: Build
         run: npm run build
       - name: Check storage layout

abis/contracts/facets/IexecEscrow.v8.json abis/contracts/abstract/IexecEscrow.jsonabis/contracts/facets/IexecEscrow.v8.json renamed to abis/contracts/abstract/IexecEscrow.json

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

…cets/IexecEscrow.v8.sol/IexecEscrow.json …bstract/IexecEscrow.sol/IexecEscrow.jsonabis/human-readable-abis/contracts/facets/IexecEscrow.v8.sol/IexecEscrow.json renamed to abis/human-readable-abis/contracts/abstract/IexecEscrow.sol/IexecEscrow.json abis/human-readable-abis/contracts/facets/IexecEscrow.v8.sol/IexecEscrow.json renamed to abis/human-readable-abis/contracts/abstract/IexecEscrow.sol/IexecEscrow.json

@@ -6,9 +6,9 @@ pragma solidity ^0.8.0;
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
-import {FacetBase} from "../abstract/FacetBase.sol";
+import {FacetBase} from "./FacetBase.sol";
 
-contract IexecPocoCommon is FacetBase {
+abstract contract IexecPocoCommon is FacetBase {
     using Math for uint256;
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;

…elper.sol/ReceiveApprovalTestHelper.json …sFacetMock.sol/MatchOrdersFacetMock.jsonabis/human-readable-abis/contracts/tools/testing/ReceiveApprovalTestHelper.sol/ReceiveApprovalTestHelper.json renamed to abis/human-readable-abis/contracts/tools/testing/MatchOrdersFacetMock.sol/MatchOrdersFacetMock.json abis/human-readable-abis/contracts/tools/testing/ReceiveApprovalTestHelper.sol/ReceiveApprovalTestHelper.json renamed to abis/human-readable-abis/contracts/tools/testing/MatchOrdersFacetMock.sol/MatchOrdersFacetMock.json

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

contracts/facets/IexecEscrow.v8.sol contracts/abstract/IexecEscrow.solcontracts/facets/IexecEscrow.v8.sol renamed to contracts/abstract/IexecEscrow.sol

@@ -187,10 +187,11 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, IexecERC2
                 IexecLibOrders_v5.RequestOrder
             )
         );
-
         // Validate that sender is the requester
         // This ensures the caller is authorized to create this deal
-        if (requestorder.requester != sender) revert("caller-must-be-requester");
+        if (requestorder.requester != sender) {
+            revert("caller-must-be-requester");
+        }
     }
 
     function _deposit(address from, uint256 amount) internal {

contracts/facets/IexecPocoCommon.sol contracts/abstract/IexecPocoCommon.solcontracts/facets/IexecPocoCommon.sol renamed to contracts/abstract/IexecPocoCommon.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 
 import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
 import {FacetBase} from "../abstract/FacetBase.sol";
-import {SignatureVerifier} from "./SignatureVerifier.sol";
+import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
 import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";

contracts/facets/SignatureVerifier.sol contracts/abstract/SignatureVerifier.solcontracts/facets/SignatureVerifier.sol renamed to contracts/abstract/SignatureVerifier.sol

@@ -12,9 +12,9 @@ import {FacetBase} from "../abstract/FacetBase.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
 import {IexecPoco1Errors} from "../interfaces/IexecPoco1Errors.sol";
-import {IexecEscrow} from "./IexecEscrow.v8.sol";
-import {IexecPocoCommon} from "./IexecPocoCommon.sol";
-import {SignatureVerifier} from "./SignatureVerifier.sol";
+import {IexecEscrow} from "../abstract/IexecEscrow.sol";
+import {IexecPocoCommon} from "../abstract/IexecPocoCommon.sol";
+import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
 
 struct Matching {
     bytes32 apporderHash;