feat: no need for ModuleAccessController in Finality and Request

defi-wonderland · Nov 12, 2024 · 992c835 · 992c835
1 parent f6e1762
commit 992c835
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/src/contracts/EBOFinalityModule.sol b/src/contracts/EBOFinalityModule.sol
@@ -2,8 +2,6 @@
 pragma solidity 0.8.26;
 
 import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
-import {ModuleAccessController} from
-  '@defi-wonderland/prophet-modules/solidity/contracts/modules/access/ModuleAccessController.sol';
 
 import {EnumerableSet} from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
@@ -20,7 +18,7 @@ import {
  * @notice Module allowing users to index data into the subgraph
  * as a result of a request being finalized
  */
-contract EBOFinalityModule is ModuleAccessController, IEBOFinalityModule {
+contract EBOFinalityModule is Module, IEBOFinalityModule {
   using EnumerableSet for EnumerableSet.AddressSet;
 
   /// @inheritdoc IEBOFinalityModule
@@ -37,11 +35,7 @@ contract EBOFinalityModule is ModuleAccessController, IEBOFinalityModule {
    * @param _eboRequestCreator The address of the EBORequestCreator
    * @param _arbitrable The address of the Arbitrable contract
    */
-  constructor(
-    IOracle _oracle,
-    IEBORequestCreator _eboRequestCreator,
-    IArbitrable _arbitrable
-  ) ModuleAccessController(_oracle) {
+  constructor(IOracle _oracle, IEBORequestCreator _eboRequestCreator, IArbitrable _arbitrable) Module(_oracle) {
     _addEBORequestCreator(_eboRequestCreator);
     ARBITRABLE = _arbitrable;
   }

diff --git a/src/contracts/EBORequestModule.sol b/src/contracts/EBORequestModule.sol
@@ -2,8 +2,6 @@
 pragma solidity 0.8.26;
 
 import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
-import {ModuleAccessController} from
-  '@defi-wonderland/prophet-modules/solidity/contracts/modules/access/ModuleAccessController.sol';
 import {EnumerableSet} from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
 import {IArbitrable, IEBORequestCreator, IEBORequestModule, IOracle} from 'interfaces/IEBORequestModule.sol';
@@ -12,7 +10,7 @@ import {IArbitrable, IEBORequestCreator, IEBORequestModule, IOracle} from 'inter
  * @title EBORequestModule
  * @notice Module allowing users to create a request for RPC data for a specific epoch
  */
-contract EBORequestModule is ModuleAccessController, IEBORequestModule {
+contract EBORequestModule is Module, IEBORequestModule {
   using EnumerableSet for EnumerableSet.AddressSet;
 
   /// @inheritdoc IEBORequestModule
@@ -29,11 +27,7 @@ contract EBORequestModule is ModuleAccessController, IEBORequestModule {
    * @param _eboRequestCreator The address of the EBORequestCreator
    * @param _arbitrable The address of the Arbitrable contract
    */
-  constructor(
-    IOracle _oracle,
-    IEBORequestCreator _eboRequestCreator,
-    IArbitrable _arbitrable
-  ) ModuleAccessController(_oracle) {
+  constructor(IOracle _oracle, IEBORequestCreator _eboRequestCreator, IArbitrable _arbitrable) Module(_oracle) {
     _addEBORequestCreator(_eboRequestCreator);
     ARBITRABLE = _arbitrable;
   }