refactor: folder structure

jaybuidl · jaybuidl · commit fae3c88cc87a · 2023-06-23T01:16:04.000+01:00
diff --git a/contracts/src/arbitration/CentralizedArbitrator.sol b/contracts/src/arbitration/CentralizedArbitrator.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.18;
 
-import {IArbitrableV2, IArbitratorV2} from "./IArbitratorV2.sol";
+import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
 
 /// @title Centralized Arbitrator
 /// @dev This is a centralized arbitrator deciding alone on the result of disputes. It illustrates how IArbitratorV2 interface can be implemented.
diff --git a/contracts/src/arbitration/KlerosCore.sol b/contracts/src/arbitration/KlerosCore.sol
@@ -8,9 +8,9 @@
 
 pragma solidity 0.8.18;
 
-import {IArbitrableV2, IArbitratorV2} from "./IArbitratorV2.sol";
-import "./IDisputeKit.sol";
-import "./ISortitionModule.sol";
+import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
+import "./interfaces/IDisputeKit.sol";
+import "./interfaces/ISortitionModule.sol";
 import "../libraries/SafeERC20.sol";
 
 /// @title KlerosCore
diff --git a/contracts/src/arbitration/KlerosGovernor.sol b/contracts/src/arbitration/KlerosGovernor.sol
@@ -7,7 +7,7 @@
 
 pragma solidity 0.8.18;
 
-import {IArbitrableV2, IArbitratorV2} from "./IArbitrableV2.sol";
+import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitrableV2.sol";
 import "../libraries/CappedMath.sol";
 
 /// @title KlerosGovernor for V2. Note that appeal functionality and evidence submission will be handled by the court.
diff --git a/contracts/src/arbitration/SortitionModule.sol b/contracts/src/arbitration/SortitionModule.sol
@@ -10,9 +10,9 @@
 
 pragma solidity 0.8.18;
 
-import "../arbitration/KlerosCore.sol";
-import "./ISortitionModule.sol";
-import "../arbitration/IDisputeKit.sol";
+import "./KlerosCore.sol";
+import "./interfaces/ISortitionModule.sol";
+import "./interfaces/IDisputeKit.sol";
 import "../rng/RNG.sol";
 
 /// @title SortitionModule
diff --git a/contracts/src/arbitration/arbitrables/ArbitrableExample.sol b/contracts/src/arbitration/arbitrables/ArbitrableExample.sol
@@ -2,9 +2,7 @@
 
 pragma solidity 0.8.18;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "../IArbitrable.sol";
-import "../../evidence/IMetaEvidence.sol";
+import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitrableV2.sol";
 
 /// @title ArbitrableExample
 /// An example of an arbitrable contract which connects to the arbitator that implements the updated interface.
diff --git a/contracts/src/arbitration/arbitrables/DisputeResolver.sol b/contracts/src/arbitration/arbitrables/DisputeResolver.sol
@@ -5,7 +5,7 @@
 /// @custom:auditors: []
 /// @custom:bounties: []
 
-import "../IArbitrableV2.sol";
+import "../interfaces/IArbitrableV2.sol";
 
 pragma solidity 0.8.18;
 
diff --git a/contracts/src/arbitration/dispute-kits/BaseDisputeKit.sol b/contracts/src/arbitration/dispute-kits/BaseDisputeKit.sol
@@ -8,7 +8,7 @@
 
 pragma solidity 0.8.18;
 
-import "../IDisputeKit.sol";
+import "../interfaces/IDisputeKit.sol";
 import "../KlerosCore.sol";
 
 /// @title BaseDisputeKit
diff --git a/contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol b/contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol
@@ -9,7 +9,7 @@
 pragma solidity 0.8.18;
 
 import "./BaseDisputeKit.sol";
-import "../../evidence/IEvidence.sol";
+import "../interfaces/IEvidence.sol";
 
 /// @title DisputeKitClassic
 /// Dispute kit implementation of the Kleros v1 features including:
diff --git a/contracts/src/arbitration/dispute-kits/DisputeKitSybilResistant.sol b/contracts/src/arbitration/dispute-kits/DisputeKitSybilResistant.sol
@@ -9,7 +9,7 @@
 pragma solidity 0.8.18;
 
 import "./BaseDisputeKit.sol";
-import "../../evidence/IEvidence.sol";
+import "../interfaces//IEvidence.sol";
 
 interface IProofOfHumanity {
     /// @dev Return true if the submission is registered and not expired.
diff --git a/contracts/src/arbitration/evidence/EvidenceModule.sol b/contracts/src/arbitration/evidence/EvidenceModule.sol
@@ -10,7 +10,7 @@
 pragma solidity 0.8.18;
 
 // TODO: standard interfaces should be placed in a separated repo (?)
-import "../arbitration/IArbitratorV2.sol";
+import "../interfaces/IArbitratorV2.sol";
 
 /// @title Implementation of the Evidence Standard for cross-chain submissions
 contract EvidenceModule {
diff --git a/contracts/src/arbitration/evidence/ModeratedEvidenceModule.sol b/contracts/src/arbitration/evidence/ModeratedEvidenceModule.sol
@@ -10,8 +10,8 @@
 pragma solidity 0.8.18;
 
 // TODO: standard interfaces should be placed in a separated repo (?)
-import {IArbitrableV2, IArbitratorV2} from "../arbitration/IArbitrableV2.sol";
-import "../libraries/CappedMath.sol";
+import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitrableV2.sol";
+import "../../libraries/CappedMath.sol";
 
 /// @title Implementation of the Evidence Standard with Moderated Submissions
 contract ModeratedEvidenceModule is IArbitrableV2 {
diff --git a/contracts/src/arbitration/interfaces/IArbitrableV2.sol b/contracts/src/arbitration/interfaces/IArbitrableV2.sol
diff --git a/contracts/src/arbitration/interfaces/IArbitratorV2.sol b/contracts/src/arbitration/interfaces/IArbitratorV2.sol
diff --git a/contracts/src/arbitration/interfaces/IDisputeKit.sol b/contracts/src/arbitration/interfaces/IDisputeKit.sol
diff --git a/contracts/src/arbitration/interfaces/IEvidence.sol b/contracts/src/arbitration/interfaces/IEvidence.sol
diff --git a/contracts/src/arbitration/interfaces/ISortitionModule.sol b/contracts/src/arbitration/interfaces/ISortitionModule.sol
diff --git a/contracts/src/gateway/ForeignGateway.sol b/contracts/src/gateway/ForeignGateway.sol
@@ -8,7 +8,6 @@
 
 pragma solidity 0.8.18;
 
-import "../arbitration/IArbitrableV2.sol";
 import "./interfaces/IForeignGateway.sol";
 
 /// Foreign Gateway
diff --git a/contracts/src/gateway/HomeGateway.sol b/contracts/src/gateway/HomeGateway.sol
@@ -8,7 +8,6 @@
 
 pragma solidity 0.8.18;
 
-import "../arbitration/IArbitratorV2.sol";
 import "./interfaces/IForeignGateway.sol";
 import "./interfaces/IHomeGateway.sol";
 import "../libraries/SafeERC20.sol";
diff --git a/contracts/src/gateway/interfaces/IForeignGateway.sol b/contracts/src/gateway/interfaces/IForeignGateway.sol
@@ -8,7 +8,7 @@
 
 pragma solidity 0.8.18;
 
-import "../../arbitration/IArbitratorV2.sol";
+import "../../arbitration/interfaces/IArbitratorV2.sol";
 import "@kleros/vea-contracts/src/interfaces/gateways/IReceiverGateway.sol";
 
 interface IForeignGateway is IArbitratorV2, IReceiverGateway {
diff --git a/contracts/src/gateway/interfaces/IHomeGateway.sol b/contracts/src/gateway/interfaces/IHomeGateway.sol
@@ -9,8 +9,8 @@
 pragma solidity 0.8.18;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "../../arbitration/IArbitrableV2.sol";
 import "@kleros/vea-contracts/src/interfaces/gateways/ISenderGateway.sol";
+import "../../arbitration/interfaces/IArbitrableV2.sol";
 
 interface IHomeGateway is IArbitrableV2, ISenderGateway {
     /// @dev To be emitted when a dispute is received from the IForeignGateway.
diff --git a/contracts/src/kleros-v1/kleros-liquid-xdai/xKlerosLiquidV2.sol b/contracts/src/kleros-v1/kleros-liquid-xdai/xKlerosLiquidV2.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.18;
 
 import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {IArbitratorV2, IArbitrableV2} from "../../arbitration/IArbitratorV2.sol";
+import {IArbitratorV2, IArbitrableV2} from "../../arbitration/interfaces/IArbitratorV2.sol";
 import {ITokenController} from "../interfaces/ITokenController.sol";
 import {WrappedPinakion} from "./WrappedPinakion.sol";
 import {IRandomAuRa} from "./interfaces/IRandomAuRa.sol";
diff --git a/contracts/src/kleros-v1/kleros-liquid/KlerosLiquidToV2Governor.sol b/contracts/src/kleros-v1/kleros-liquid/KlerosLiquidToV2Governor.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.18;
 
 import "../interfaces/IKlerosLiquid.sol";
 import "../interfaces/ITokenController.sol";
-import {IArbitratorV2, IArbitrableV2} from "../../arbitration/IArbitratorV2.sol";
+import {IArbitratorV2, IArbitrableV2} from "../../arbitration/interfaces/IArbitratorV2.sol";
 
 interface IPinakion {
     function balanceOf(address who) external view returns (uint256);
