Skip to content

Commit

Permalink
refactor: rename modules/accessControl to modules/access
Browse files Browse the repository at this point in the history
  • Loading branch information
xorsal committed Nov 7, 2024
1 parent 14f565e commit 823459f
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion solidity/contracts/CommonAccessController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity ^0.8.19;

import {IAccessController} from '../interfaces/IAccessController.sol';
import {IAccessModule} from '../interfaces/modules/accessControl/IAccessModule.sol';
import {IAccessModule} from '../interfaces/modules/access/IAccessModule.sol';

abstract contract CommonAccessController is IAccessController {
/**
Expand Down
2 changes: 1 addition & 1 deletion solidity/contracts/Oracle.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {IOracle} from '../interfaces/IOracle.sol';

import {IDisputeModule} from '../interfaces/modules/dispute/IDisputeModule.sol';

import {IAccessModule} from '../interfaces/modules/accessControl/IAccessModule.sol';
import {IAccessModule} from '../interfaces/modules/access/IAccessModule.sol';
import {IFinalityModule} from '../interfaces/modules/finality/IFinalityModule.sol';
import {IRequestModule} from '../interfaces/modules/request/IRequestModule.sol';
import {IResolutionModule} from '../interfaces/modules/resolution/IResolutionModule.sol';
Expand Down
2 changes: 1 addition & 1 deletion solidity/test/integration/IntegrationBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {console} from 'forge-std/console.sol';

import {IDisputeModule} from '../../interfaces/modules/dispute/IDisputeModule.sol';

import {IAccessModule} from '../../interfaces/modules/accessControl/IAccessModule.sol';
import {IAccessModule} from '../../interfaces/modules/access/IAccessModule.sol';
import {IFinalityModule} from '../../interfaces/modules/finality/IFinalityModule.sol';
import {IRequestModule} from '../../interfaces/modules/request/IRequestModule.sol';
import {IResolutionModule} from '../../interfaces/modules/resolution/IResolutionModule.sol';
Expand Down
2 changes: 1 addition & 1 deletion solidity/test/mocks/interfaces/IMockAccessModule.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.19;

import {IAccessModule} from '../../../interfaces/modules/accessControl/IAccessModule.sol';
import {IAccessModule} from '../../../interfaces/modules/access/IAccessModule.sol';

interface IMockAccessModule is IAccessModule {
function decodeAccesControlData(bytes calldata _data)
Expand Down
2 changes: 1 addition & 1 deletion solidity/test/unit/AccessController.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
import 'forge-std/Test.sol';

import {CommonAccessController, OracleAccessController} from '../../contracts/OracleAccessController.sol';

Check warning on line 6 in solidity/test/unit/AccessController.t.sol

View workflow job for this annotation

GitHub Actions / Run Linters (20.x)

imported name CommonAccessController is not used
import {IAccessController, IAccessModule} from '../../interfaces/modules/accessControl/IAccessModule.sol';
import {IAccessController, IAccessModule} from '../../interfaces/modules/access/IAccessModule.sol';
import {Helpers} from '../utils/Helpers.sol';

contract MockAccessControl is OracleAccessController {
Expand Down
2 changes: 1 addition & 1 deletion solidity/test/unit/Oracle.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {IOracle} from '../../interfaces/IOracle.sol';
import {IDisputeModule} from '../../interfaces/modules/dispute/IDisputeModule.sol';

import {IAccessController, IOracleAccessController} from '../../interfaces/IOracleAccessController.sol';
import {IAccessModule} from '../../interfaces/modules/accessControl/IAccessModule.sol';
import {IAccessModule} from '../../interfaces/modules/access/IAccessModule.sol';
import {IFinalityModule} from '../../interfaces/modules/finality/IFinalityModule.sol';
import {IRequestModule} from '../../interfaces/modules/request/IRequestModule.sol';
import {IResolutionModule} from '../../interfaces/modules/resolution/IResolutionModule.sol';
Expand Down

0 comments on commit 823459f

Please sign in to comment.