refactor: remove ModuleAccessController

defi-wonderland · Nov 14, 2024 · c3519af · c3519af
1 parent 7f0aa0f
commit c3519af
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 94 deletions.
diff --git a/solidity/contracts/modules/access/ModuleAccessController.sol b/solidity/contracts/modules/access/ModuleAccessController.sol
diff --git a/solidity/contracts/modules/dispute/BondEscalationModule.sol b/solidity/contracts/modules/dispute/BondEscalationModule.sol
@@ -7,7 +7,8 @@ import {FixedPointMathLib} from 'solmate/src/utils/FixedPointMathLib.sol';
 
 import {IBondEscalationModule} from '../../../interfaces/modules/dispute/IBondEscalationModule.sol';
 
-import {ModuleAccessController} from '../access/ModuleAccessController.sol';
+import {ModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/contracts/access/ModuleAccessController.sol';
 
 import {ModuleTypehash} from '../../utils/ModuleTypehash.sol';
 

diff --git a/solidity/contracts/modules/dispute/CircuitResolverModule.sol b/solidity/contracts/modules/dispute/CircuitResolverModule.sol
@@ -7,7 +7,8 @@ import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle
 import {IProphetVerifier} from '../../../interfaces/IProphetVerifier.sol';
 import {ICircuitResolverModule} from '../../../interfaces/modules/dispute/ICircuitResolverModule.sol';
 
-import {ModuleAccessController} from '../access/ModuleAccessController.sol';
+import {ModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/contracts/access/ModuleAccessController.sol';
 
 contract CircuitResolverModule is ModuleAccessController, ICircuitResolverModule {
   /// @notice Keeps track of the correct responses to requests

diff --git a/solidity/contracts/modules/dispute/RootVerificationModule.sol b/solidity/contracts/modules/dispute/RootVerificationModule.sol
@@ -6,7 +6,8 @@ import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle
 
 import {IRootVerificationModule} from '../../../interfaces/modules/dispute/IRootVerificationModule.sol';
 import {MerkleLib} from '../../libraries/MerkleLib.sol';
-import {ModuleAccessController} from '../access/ModuleAccessController.sol';
+import {ModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/contracts/access/ModuleAccessController.sol';
 
 contract RootVerificationModule is ModuleAccessController, IRootVerificationModule {
   using MerkleLib for MerkleLib.Tree;

diff --git a/solidity/contracts/modules/resolution/ArbitratorModule.sol b/solidity/contracts/modules/resolution/ArbitratorModule.sol
@@ -2,11 +2,13 @@
 pragma solidity ^0.8.19;
 
 import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
+
+import {ModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/contracts/access/ModuleAccessController.sol';
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 
 import {IArbitrator} from '../../../interfaces/IArbitrator.sol';
 import {IArbitratorModule} from '../../../interfaces/modules/resolution/IArbitratorModule.sol';
-import {ModuleAccessController} from '../access/ModuleAccessController.sol';
 
 contract ArbitratorModule is ModuleAccessController, IArbitratorModule {
   /**

diff --git a/solidity/contracts/modules/resolution/BondEscalationResolutionModule.sol b/solidity/contracts/modules/resolution/BondEscalationResolutionModule.sol
@@ -16,7 +16,8 @@ import {IResolutionModule} from
 
 import {IBondEscalationResolutionModule} from
   '../../../interfaces/modules/resolution/IBondEscalationResolutionModule.sol';
-import {ModuleAccessController} from '../access/ModuleAccessController.sol';
+import {ModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/contracts/access/ModuleAccessController.sol';
 
 import {ModuleTypehash} from '../../utils/ModuleTypehash.sol';
 

diff --git a/solidity/contracts/modules/resolution/ERC20ResolutionModule.sol b/solidity/contracts/modules/resolution/ERC20ResolutionModule.sol
@@ -12,7 +12,8 @@ import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle
 import {IERC20ResolutionModule} from '../../../interfaces/modules/resolution/IERC20ResolutionModule.sol';
 
 import {ModuleTypehash} from '../../utils/ModuleTypehash.sol';
-import {ModuleAccessController} from '../access/ModuleAccessController.sol';
+import {ModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/contracts/access/ModuleAccessController.sol';
 
 contract ERC20ResolutionModule is ModuleAccessController, IERC20ResolutionModule {
   using SafeERC20 for IERC20;

diff --git a/solidity/contracts/modules/resolution/PrivateERC20ResolutionModule.sol b/solidity/contracts/modules/resolution/PrivateERC20ResolutionModule.sol
@@ -11,7 +11,8 @@ import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 
 import {IPrivateERC20ResolutionModule} from '../../../interfaces/modules/resolution/IPrivateERC20ResolutionModule.sol';
-import {ModuleAccessController} from '../access/ModuleAccessController.sol';
+import {ModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/contracts/access/ModuleAccessController.sol';
 
 contract PrivateERC20ResolutionModule is ModuleAccessController, IPrivateERC20ResolutionModule {
   using SafeERC20 for IERC20;

diff --git a/solidity/interfaces/modules/access/IModuleAccessController.sol b/solidity/interfaces/modules/access/IModuleAccessController.sol
diff --git a/solidity/test/unit/modules/dispute/BondEscalationModule.t.sol b/solidity/test/unit/modules/dispute/BondEscalationModule.t.sol
@@ -21,7 +21,8 @@ import {
 import {ModuleTypehash} from '../../../../contracts/utils/ModuleTypehash.sol';
 import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';
 import {IBondEscalationAccounting} from '../../../../interfaces/extensions/IBondEscalationAccounting.sol';
-import {IModuleAccessController} from '../../../../interfaces/modules/access/IModuleAccessController.sol';
+import {IModuleAccessController} from
+  '@defi-wonderland/prophet-core/solidity/interfaces/access/IModuleAccessController.sol';
 
 /**
  * @dev Harness to set an entry in the requestData mapping, without triggering setup request hooks