Skip to content

Commit f251da1

Browse files
committed
Introduce /interfaces directory WIP
1 parent 35b5734 commit f251da1

69 files changed

Lines changed: 169 additions & 175 deletions

File tree

Some content is hidden

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

contracts/bridging/WormholeBridgeForColony.sol

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
pragma solidity 0.8.27;
2020

2121
import { IWormhole } from "../../lib/wormhole/ethereum/contracts/interfaces/IWormhole.sol";
22-
import { IColonyNetwork } from "../colonyNetwork/IColonyNetwork.sol";
23-
import { IColonyBridge } from "./IColonyBridge.sol";
22+
import { IColonyBridge } from "../interfaces/IColonyBridge.sol";
2423
import { CallWithGuards } from "../common/CallWithGuards.sol";
2524
import { DSAuth } from "../../lib/dappsys/auth.sol";
2625

contracts/colony/Colony.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ pragma experimental ABIEncoderV2;
2121

2222
import { ERC20Extended } from "./../common/ERC20Extended.sol";
2323
import { Multicall } from "./../common/Multicall.sol";
24-
import { IEtherRouter } from "./../common/IEtherRouter.sol";
24+
import { IEtherRouter } from "./../interfaces/IEtherRouter.sol";
2525
import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
26-
import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
27-
import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
26+
import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
27+
import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
2828
import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
2929
import { ColonyStorage } from "./ColonyStorage.sol";
3030
import { ColonyAuthority } from "./ColonyAuthority.sol";

contracts/colony/ColonyArbitraryTransaction.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ pragma solidity 0.8.27;
2020
pragma experimental ABIEncoderV2;
2121

2222
import { ERC20Extended } from "./../common/ERC20Extended.sol";
23-
import { IEtherRouter } from "./../common/IEtherRouter.sol";
23+
import { IEtherRouter } from "./../interfaces/IEtherRouter.sol";
2424
import { MultiChain } from "./../common/MultiChain.sol";
25-
import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
25+
import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
2626
import { ColonyStorage } from "./ColonyStorage.sol";
27-
import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
27+
import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
2828
import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
2929

3030
contract ColonyArbitraryTransaction is ColonyStorage {

contracts/colony/ColonyDomains.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
2020
pragma experimental ABIEncoderV2;
2121

2222
import { ColonyStorage } from "./ColonyStorage.sol";
23-
import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
23+
import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
2424

2525
contract ColonyDomains is ColonyStorage {
2626
// prettier-ignore

contracts/colony/ColonyFunding.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
pragma solidity 0.8.27;
2020
pragma experimental "ABIEncoderV2";
2121

22-
import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
22+
import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
2323
import { ColonyStorage } from "./ColonyStorage.sol";
2424
import { ERC20Extended } from "./../common/ERC20Extended.sol";
25-
import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
25+
import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
2626

2727
contract ColonyFunding is
2828
ColonyStorage // ignore-swc-123

contracts/colony/ColonyRewards.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
pragma solidity 0.8.27;
2020
pragma experimental "ABIEncoderV2";
2121

22-
import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
22+
import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
2323
import { ColonyStorage } from "./ColonyStorage.sol";
2424
import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
2525
import { ERC20Extended } from "./../common/ERC20Extended.sol";
26-
import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
26+
import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
2727

2828
contract ColonyRewards is
2929
ColonyStorage,

contracts/colony/ColonyStorage.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { DSMath } from "./../../lib/dappsys/math.sol";
2323
import { CommonStorage } from "./../common/CommonStorage.sol";
2424
import { ERC20Extended } from "./../common/ERC20Extended.sol";
2525
import { DomainRoles } from "./../common/DomainRoles.sol";
26-
import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
26+
import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
2727
import { ColonyNetworkDataTypes } from "./../colonyNetwork/ColonyNetworkDataTypes.sol";
2828
import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
2929
import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

contracts/colonyNetwork/ColonyNetwork.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
2020
pragma experimental "ABIEncoderV2";
2121

2222
import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
23-
import { IReputationMiningCycle } from "./../reputationMiningCycle/IReputationMiningCycle.sol";
23+
import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
2424
import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
2525
import { Multicall } from "./../common/Multicall.sol";
2626

contracts/colonyNetwork/ColonyNetworkAuction.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
2222
import { MultiChain } from "./../common/MultiChain.sol";
2323
import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
2424
import { ERC20Extended } from "./../common/ERC20Extended.sol";
25-
import { IMetaColony } from "./../colony/IMetaColony.sol";
25+
import { IMetaColony } from "./../interfaces/IMetaColony.sol";
2626
import { DSMath } from "./../../lib/dappsys/math.sol";
2727

2828
contract ColonyNetworkAuction is ColonyNetworkStorage {

0 commit comments

Comments
 (0)