Skip to content

Commit

Permalink
chore: update import filepaths
Browse files Browse the repository at this point in the history
  • Loading branch information
xorsal committed Nov 13, 2024
1 parent e648aa4 commit 13e0ba1
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 21 deletions.
2 changes: 1 addition & 1 deletion solidity/test/integration/ContractCallRequest.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
import {
ContractCallRequestModule,
IContractCallRequestModule
} from '../../contracts/modules/request/ContractCallRequestModule.sol';
} from '../../contracts/examples/modules/request/ContractCallRequestModule.sol';
import {MockCallee} from '../mocks/MockCallee.sol';
import './IntegrationBase.sol';

Expand Down
24 changes: 14 additions & 10 deletions solidity/test/integration/IntegrationBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,30 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';

import {IWETH9} from '../utils/external/IWETH9.sol';

import {
BondedDisputeModule, IBondedDisputeModule
} from '../../contracts/examples/modules/dispute/BondedDisputeModule.sol';
import {
IRootVerificationModule,
RootVerificationModule
} from '../../contracts/examples/modules/dispute/RootVerificationModule.sol';

import {
IMultipleCallbacksModule,
MultipleCallbacksModule
} from '../../contracts/examples/modules/finality/MultipleCallbacksModule.sol';
import {AccountingExtension, IAccountingExtension} from '../../contracts/extensions/AccountingExtension.sol';
import {
BondEscalationAccounting, IBondEscalationAccounting
} from '../../contracts/extensions/BondEscalationAccounting.sol';
import {BondEscalationModule, IBondEscalationModule} from '../../contracts/modules/dispute/BondEscalationModule.sol';
import {BondedDisputeModule, IBondedDisputeModule} from '../../contracts/modules/dispute/BondedDisputeModule.sol';
import {
IRootVerificationModule, RootVerificationModule
} from '../../contracts/modules/dispute/RootVerificationModule.sol';
import {CallbackModule, ICallbackModule} from '../../contracts/modules/finality/CallbackModule.sol';
import {
IMultipleCallbacksModule,
MultipleCallbacksModule
} from '../../contracts/modules/finality/MultipleCallbacksModule.sol';

import {HttpRequestModule, IHttpRequestModule} from '../../contracts/modules/request/HttpRequestModule.sol';
import {
ISparseMerkleTreeRequestModule,
SparseMerkleTreeRequestModule
} from '../../contracts/modules/request/SparseMerkleTreeRequestModule.sol';
} from '../../contracts/examples/modules/request/SparseMerkleTreeRequestModule.sol';
import {HttpRequestModule, IHttpRequestModule} from '../../contracts/modules/request/HttpRequestModule.sol';
import {ArbitratorModule, IArbitratorModule} from '../../contracts/modules/resolution/ArbitratorModule.sol';
import {BondedResponseModule, IBondedResponseModule} from '../../contracts/modules/response/BondedResponseModule.sol';
import {SparseMerkleTreeL32Verifier} from '../../contracts/periphery/SparseMerkleTreeL32Verifier.sol';
Expand Down
5 changes: 3 additions & 2 deletions solidity/test/unit/modules/dispute/BondedDisputeModule.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle
import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';

import {
BondedDisputeModule, IBondedDisputeModule
} from '../../../../contracts/modules/dispute/BondedDisputeModule.sol';
BondedDisputeModule,
IBondedDisputeModule
} from '../../../../contracts/examples/modules/dispute/BondedDisputeModule.sol';

import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
import {
CircuitResolverModule,
ICircuitResolverModule
} from '../../../../contracts/modules/dispute/CircuitResolverModule.sol';
} from '../../../../contracts/examples/modules/dispute/CircuitResolverModule.sol';

import {IProphetVerifier} from '../../../../interfaces/IProphetVerifier.sol';
import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
import {
IRootVerificationModule,
RootVerificationModule
} from '../../../../contracts/modules/dispute/RootVerificationModule.sol';
} from '../../../../contracts/examples/modules/dispute/RootVerificationModule.sol';

import {ITreeVerifier} from '../../../../interfaces/ITreeVerifier.sol';
import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle
import {
IMultipleCallbacksModule,
MultipleCallbacksModule
} from '../../../../contracts/modules/finality/MultipleCallbacksModule.sol';
} from '../../../../contracts/examples/modules/finality/MultipleCallbacksModule.sol';

import {IProphetCallback} from '../../../../interfaces/IProphetCallback.sol';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
import {
ContractCallRequestModule,
IContractCallRequestModule
} from '../../../../contracts/modules/request/ContractCallRequestModule.sol';
} from '../../../../contracts/examples/modules/request/ContractCallRequestModule.sol';

import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
import {
ISparseMerkleTreeRequestModule,
SparseMerkleTreeRequestModule
} from '../../../../contracts/modules/request/SparseMerkleTreeRequestModule.sol';
} from '../../../../contracts/examples/modules/request/SparseMerkleTreeRequestModule.sol';

import {ITreeVerifier} from '../../../../interfaces/ITreeVerifier.sol';
import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {ValidatorLib} from '@defi-wonderland/prophet-core/solidity/libraries/Val
import {
BondEscalationResolutionModule,
IBondEscalationResolutionModule
} from '../../../../contracts/modules/resolution/BondEscalationResolutionModule.sol';
} from '../../../../contracts/examples/modules/resolution/BondEscalationResolutionModule.sol';
import {IBondEscalationAccounting} from '../../../../interfaces/extensions/IBondEscalationAccounting.sol';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {ValidatorLib} from '@defi-wonderland/prophet-core/solidity/libraries/Val
import {
ERC20ResolutionModule,
IERC20ResolutionModule
} from '../../../../contracts/modules/resolution/ERC20ResolutionModule.sol';
} from '../../../../contracts/examples/modules/resolution/ERC20ResolutionModule.sol';

import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
import {
IPrivateERC20ResolutionModule,
PrivateERC20ResolutionModule
} from '../../../../contracts/modules/resolution/PrivateERC20ResolutionModule.sol';
} from '../../../../contracts/examples/modules/resolution/PrivateERC20ResolutionModule.sol';
import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';

contract ForTest_PrivateERC20ResolutionModule is PrivateERC20ResolutionModule {
Expand Down

0 comments on commit 13e0ba1

Please sign in to comment.