Skip to content

Commit f8536e6

Browse files
committed
chore: do not use transitive imports
1 parent 4a3c20f commit f8536e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+118
-85
lines changed

contracts/src/arbitration/DisputeTemplateRegistry.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.24;
33

4-
import "../proxy/UUPSProxiable.sol";
5-
import "../proxy/Initializable.sol";
6-
import "./interfaces/IDisputeTemplateRegistry.sol";
4+
import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
5+
import {Initializable} from "../proxy/Initializable.sol";
6+
import {IDisputeTemplateRegistry} from "./interfaces/IDisputeTemplateRegistry.sol";
77

88
/// @title Dispute Template Registry
99
/// @notice A contract to maintain a registry of dispute templates.

contracts/src/arbitration/KlerosCore.sol

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
pragma solidity ^0.8.24;
44

5-
import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
5+
import {IArbitrableV2} from "./interfaces/IArbitrableV2.sol";
6+
import {IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
67
import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
78
import {ISortitionModule} from "./interfaces/ISortitionModule.sol";
89
import {Initializable} from "../proxy/Initializable.sol";
910
import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
10-
import {SafeERC20, IERC20} from "../libraries/SafeERC20.sol";
11+
import {SafeERC20} from "../libraries/SafeERC20.sol";
1112
import {SafeSend} from "../libraries/SafeSend.sol";
13+
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1214
import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
1315
import "../libraries/Constants.sol";
1416

contracts/src/arbitration/KlerosGovernor.sol

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
pragma solidity ^0.8.24;
44

5-
import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitrableV2.sol";
5+
import {IArbitrableV2} from "./interfaces/IArbitrableV2.sol";
6+
import {IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
67
import {SafeSend} from "../libraries/SafeSend.sol";
7-
import "./interfaces/IDisputeTemplateRegistry.sol";
8+
import {IDisputeTemplateRegistry} from "./interfaces/IDisputeTemplateRegistry.sol";
89

910
/// @title KlerosGovernor for V2.
1011
/// @dev Appeal and evidence submission is handled by the court.

contracts/src/arbitration/PolicyRegistry.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.24;
33

4-
import "../proxy/UUPSProxiable.sol";
5-
import "../proxy/Initializable.sol";
4+
import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
5+
import {Initializable} from "../proxy/Initializable.sol";
66

77
/// @title PolicyRegistry
88
/// @notice A contract to maintain a policy for each court.

contracts/src/arbitration/SortitionModule.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pragma solidity ^0.8.24;
44

55
import {KlerosCore} from "./KlerosCore.sol";
66
import {ISortitionModule} from "./interfaces/ISortitionModule.sol";
7-
import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
87
import {Initializable} from "../proxy/Initializable.sol";
98
import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
109
import {SortitionTrees, TreeKey, CourtID} from "../libraries/SortitionTrees.sol";

contracts/src/arbitration/arbitrables/ArbitrableExample.sol

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
pragma solidity ^0.8.24;
44

5-
import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitrableV2.sol";
6-
import "../interfaces/IDisputeTemplateRegistry.sol";
7-
import "../../libraries/SafeERC20.sol";
5+
import {IArbitrableV2} from "../interfaces/IArbitrableV2.sol";
6+
import {IArbitratorV2} from "../interfaces/IArbitratorV2.sol";
7+
import {IDisputeTemplateRegistry} from "../interfaces/IDisputeTemplateRegistry.sol";
8+
import {SafeERC20} from "../../libraries/SafeERC20.sol";
9+
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
810

911
/// @title ArbitrableExample
1012
/// @notice An example of an arbitrable contract which connects to the arbitator that implements the updated interface.

contracts/src/arbitration/arbitrables/DisputeResolver.sol

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// SPDX-License-Identifier: MIT
22

3-
import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitrableV2.sol";
4-
import "../interfaces/IDisputeTemplateRegistry.sol";
3+
import {IArbitrableV2} from "../interfaces/IArbitrableV2.sol";
4+
import {IArbitratorV2} from "../interfaces/IArbitratorV2.sol";
5+
import {IDisputeTemplateRegistry} from "../interfaces/IDisputeTemplateRegistry.sol";
56

67
pragma solidity ^0.8.24;
78

contracts/src/arbitration/devtools/DisputeResolverRuler.sol

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// SPDX-License-Identifier: MIT
22

3-
import {DisputeResolver, IArbitratorV2, IDisputeTemplateRegistry} from "../arbitrables/DisputeResolver.sol";
3+
import {DisputeResolver} from "../arbitrables/DisputeResolver.sol";
4+
import {IArbitratorV2} from "../interfaces/IArbitratorV2.sol";
5+
import {IDisputeTemplateRegistry} from "../interfaces/IDisputeTemplateRegistry.sol";
46

57
pragma solidity ^0.8.24;
68

contracts/src/arbitration/devtools/KlerosCoreRuler.sol

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
pragma solidity ^0.8.24;
44

5-
import {IArbitrableV2, IArbitratorV2} from "../interfaces/IArbitratorV2.sol";
6-
import {SafeERC20, IERC20} from "../../libraries/SafeERC20.sol";
5+
import {IArbitrableV2} from "../interfaces/IArbitrableV2.sol";
6+
import {IArbitratorV2} from "../interfaces/IArbitratorV2.sol";
77
import {UUPSProxiable} from "../../proxy/UUPSProxiable.sol";
88
import {Initializable} from "../../proxy/Initializable.sol";
9+
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
10+
import {SafeERC20} from "../../libraries/SafeERC20.sol";
911
import "../../libraries/Constants.sol";
1012

1113
/// @title KlerosCoreRuler

contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
pragma solidity ^0.8.24;
44

5-
import {DisputeKitClassicBase, KlerosCore} from "./DisputeKitClassicBase.sol";
5+
import {DisputeKitClassicBase} from "./DisputeKitClassicBase.sol";
6+
import {KlerosCore} from "../KlerosCore.sol";
67

78
/// @title DisputeKitClassic
89
/// @notice Dispute kit implementation of the Kleros v1 features including:

0 commit comments

Comments
 (0)