refactor: moved files into governance folder

aragon · Oct 24, 2023 · da10b35 · da10b35
1 parent c7ae989
commit da10b35
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 4 deletions.
diff --git a/...lugin/majority-voting/IMajorityVoting.sol → ...nance/majority-voting/IMajorityVoting.sol b/...lugin/majority-voting/IMajorityVoting.sol → ...nance/majority-voting/IMajorityVoting.sol
diff --git a/...in/majority-voting/MajorityVotingBase.sol → ...ce/majority-voting/MajorityVotingBase.sol b/...in/majority-voting/MajorityVotingBase.sol → ...ce/majority-voting/MajorityVotingBase.sol
diff --git a/contracts/src/utils/Addresslist.sol → ...src/governance/membership/Addresslist.sol b/contracts/src/utils/Addresslist.sol → ...src/governance/membership/Addresslist.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.8;
 
 import {CheckpointsUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/CheckpointsUpgradeable.sol";
 
-import {_uncheckedAdd, _uncheckedSub} from "../utils/math/UncheckedMath.sol";
+import {_uncheckedAdd, _uncheckedSub} from "../../utils/math/UncheckedMath.sol";
 
 /// @title Addresslist
 /// @author Aragon Association - 2021-2023

diff --git a/...cts/src/plugin/membership/IMembership.sol → ...src/governance/membership/IMembership.sol b/...cts/src/plugin/membership/IMembership.sol → ...src/governance/membership/IMembership.sol
diff --git a/.../placeholder-version/PlaceholderSetup.sol → .../placeholder-version/PlaceholderSetup.sol b/.../placeholder-version/PlaceholderSetup.sol → .../placeholder-version/PlaceholderSetup.sol
diff --git a/...n/placeholder-version/build-metadata.json → ...e/placeholder-version/build-metadata.json b/...n/placeholder-version/build-metadata.json → ...e/placeholder-version/build-metadata.json
diff --git a/contracts/src/plugin/proposal/IProposal.sol → ...cts/src/governance/proposal/IProposal.sol b/contracts/src/plugin/proposal/IProposal.sol → ...cts/src/governance/proposal/IProposal.sol
diff --git a/contracts/src/plugin/proposal/Proposal.sol → ...acts/src/governance/proposal/Proposal.sol b/contracts/src/plugin/proposal/Proposal.sol → ...acts/src/governance/proposal/Proposal.sol
diff --git a/...c/plugin/proposal/ProposalUpgradeable.sol → ...vernance/proposal/ProposalUpgradeable.sol b/...c/plugin/proposal/ProposalUpgradeable.sol → ...vernance/proposal/ProposalUpgradeable.sol
diff --git a/...racts/src/token/erc20/GovernanceERC20.sol → ...overnance/token/erc20/GovernanceERC20.sol b/...racts/src/token/erc20/GovernanceERC20.sol → ...overnance/token/erc20/GovernanceERC20.sol
diff --git a/...rc/token/erc20/GovernanceWrappedERC20.sol → ...ce/token/erc20/GovernanceWrappedERC20.sol b/...rc/token/erc20/GovernanceWrappedERC20.sol → ...ce/token/erc20/GovernanceWrappedERC20.sol
diff --git a/...token/erc20/IERC20MintableUpgradeable.sol → ...token/erc20/IERC20MintableUpgradeable.sol b/...token/erc20/IERC20MintableUpgradeable.sol → ...token/erc20/IERC20MintableUpgradeable.sol
diff --git a/...c/token/erc20/IGovernanceWrappedERC20.sol → ...e/token/erc20/IGovernanceWrappedERC20.sol b/...c/token/erc20/IGovernanceWrappedERC20.sol → ...e/token/erc20/IGovernanceWrappedERC20.sol
diff --git a/...racts/src/test/plugin/AddresslistMock.sol → ...s/src/test/governance/AddresslistMock.sol b/...racts/src/test/plugin/AddresslistMock.sol → ...s/src/test/governance/AddresslistMock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.8;
 
-import {Addresslist} from "../../utils/Addresslist.sol";
+import {Addresslist} from "../../governance/membership/Addresslist.sol";
 
 contract AddresslistMock is Addresslist {
     function addAddresses(address[] calldata _newAddresses) external {

diff --git a/...ts/src/test/plugin/MajorityVotingMock.sol → ...rc/test/governance/MajorityVotingMock.sol b/...ts/src/test/plugin/MajorityVotingMock.sol → ...rc/test/governance/MajorityVotingMock.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.8;
 
 import {IDAO} from "@aragon/osx/packages/contracts/src/core/dao/IDAO.sol";
 
-import {MajorityVotingBase} from "../../plugin/majority-voting/MajorityVotingBase.sol";
+import {MajorityVotingBase} from "../../governance/majority-voting/MajorityVotingBase.sol";
 
 contract MajorityVotingMock is MajorityVotingBase {
     function initializeMock(IDAO _dao, VotingSettings calldata _votingSettings) public initializer {

diff --git a/contracts/src/test/token/TestGovernanceERC20.sol b/contracts/src/test/token/TestGovernanceERC20.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.8;
 
 import {IDAO} from "@aragon/osx/packages/contracts/src/core/dao/IDAO.sol";
 
-import {GovernanceERC20} from "../../token/erc20/GovernanceERC20.sol";
+import {GovernanceERC20} from "../../governance/token/erc20/GovernanceERC20.sol";
 
 /// @title TestGovernanceERC20
 /// @author Aragon Association - 2022-2023