From 63534607106ab5bc65ae753010138d4a842cbdca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8r=E2=88=82=C2=A1?= Date: Wed, 24 Jan 2024 15:28:57 +0100 Subject: [PATCH] Grouping plugins in folders --- packages/contracts/plugin-setup-params.ts | 12 ++++++------ .../MemberAccessExecuteCondition.sol | 2 +- .../{ => conditions}/OnlyPluginUpgraderCondition.sol | 0 .../src/{ => governance}/GovernancePluginsSetup.sol | 4 ++-- .../src/{ => governance}/MainVotingPlugin.sol | 2 +- .../src/{ => governance}/MemberAccessPlugin.sol | 2 +- .../{ => governance}/governance-build-metadata.json | 0 .../governance-release-metadata.json | 0 .../src/{ => personal}/PersonalSpaceAdminPlugin.sol | 2 +- .../{ => personal}/PersonalSpaceAdminPluginSetup.sol | 2 +- .../personal-space-admin-build-metadata.json | 0 .../personal-space-admin-release-metadata.json | 0 packages/contracts/src/{ => space}/SpacePlugin.sol | 2 +- .../contracts/src/{ => space}/SpacePluginSetup.sol | 4 ++-- .../src/{ => space}/space-build-metadata.json | 0 .../src/{ => space}/space-release-metadata.json | 0 .../src/test/PersonalSpaceAdminCloneFactory.sol | 2 +- .../src/test/TestGovernancePluginsSetup.sol | 6 +++--- .../contracts/src/test/TestMemberAccessPlugin.sol | 2 +- .../test/unit-testing/governance-plugins-setup.ts | 2 +- .../personal-space-admin-plugin-setup.ts | 2 +- .../test/unit-testing/space-plugin-setup.ts | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) rename packages/contracts/src/{ => conditions}/MemberAccessExecuteCondition.sol (98%) rename packages/contracts/src/{ => conditions}/OnlyPluginUpgraderCondition.sol (100%) rename packages/contracts/src/{ => governance}/GovernancePluginsSetup.sol (98%) rename packages/contracts/src/{ => governance}/MainVotingPlugin.sol (99%) rename packages/contracts/src/{ => governance}/MemberAccessPlugin.sol (99%) rename packages/contracts/src/{ => governance}/governance-build-metadata.json (100%) rename packages/contracts/src/{ => governance}/governance-release-metadata.json (100%) rename packages/contracts/src/{ => personal}/PersonalSpaceAdminPlugin.sol (97%) rename packages/contracts/src/{ => personal}/PersonalSpaceAdminPluginSetup.sol (98%) rename packages/contracts/src/{ => personal}/personal-space-admin-build-metadata.json (100%) rename packages/contracts/src/{ => personal}/personal-space-admin-release-metadata.json (100%) rename packages/contracts/src/{ => space}/SpacePlugin.sol (98%) rename packages/contracts/src/{ => space}/SpacePluginSetup.sol (97%) rename packages/contracts/src/{ => space}/space-build-metadata.json (100%) rename packages/contracts/src/{ => space}/space-release-metadata.json (100%) diff --git a/packages/contracts/plugin-setup-params.ts b/packages/contracts/plugin-setup-params.ts index 4a1668e..43284cc 100644 --- a/packages/contracts/plugin-setup-params.ts +++ b/packages/contracts/plugin-setup-params.ts @@ -1,9 +1,9 @@ -import governanceBuildMetadata from './src/governance-build-metadata.json'; -import governanceReleaseMetadata from './src/governance-release-metadata.json'; -import personalSpaceAdminBuildMetadata from './src/personal-space-admin-build-metadata.json'; -import personalSpaceAdminReleaseMetadata from './src/personal-space-admin-release-metadata.json'; -import spaceBuildMetadata from './src/space-build-metadata.json'; -import spaceReleaseMetadata from './src/space-release-metadata.json'; +import governanceBuildMetadata from './src/governance/governance-build-metadata.json'; +import governanceReleaseMetadata from './src/governance/governance-release-metadata.json'; +import personalSpaceAdminBuildMetadata from './src/personal/personal-space-admin-build-metadata.json'; +import personalSpaceAdminReleaseMetadata from './src/personal/personal-space-admin-release-metadata.json'; +import spaceBuildMetadata from './src/space/space-build-metadata.json'; +import spaceReleaseMetadata from './src/space/space-release-metadata.json'; export const SpacePluginSetupParams: PluginSetupParams = { PLUGIN_REPO_ENS_NAME: 'geo-browser-space', diff --git a/packages/contracts/src/MemberAccessExecuteCondition.sol b/packages/contracts/src/conditions/MemberAccessExecuteCondition.sol similarity index 98% rename from packages/contracts/src/MemberAccessExecuteCondition.sol rename to packages/contracts/src/conditions/MemberAccessExecuteCondition.sol index c27b2be..f6a784e 100644 --- a/packages/contracts/src/MemberAccessExecuteCondition.sol +++ b/packages/contracts/src/conditions/MemberAccessExecuteCondition.sol @@ -5,7 +5,7 @@ pragma solidity 0.8.17; import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; import {PermissionCondition} from "@aragon/osx/core/permission/PermissionCondition.sol"; import {PermissionManager} from "@aragon/osx/core/permission/PermissionManager.sol"; -import {MEMBER_PERMISSION_ID} from "./constants.sol"; +import {MEMBER_PERMISSION_ID} from "../constants.sol"; /// @notice The condition associated with `TestSharedPlugin` contract MemberAccessExecuteCondition is PermissionCondition { diff --git a/packages/contracts/src/OnlyPluginUpgraderCondition.sol b/packages/contracts/src/conditions/OnlyPluginUpgraderCondition.sol similarity index 100% rename from packages/contracts/src/OnlyPluginUpgraderCondition.sol rename to packages/contracts/src/conditions/OnlyPluginUpgraderCondition.sol diff --git a/packages/contracts/src/GovernancePluginsSetup.sol b/packages/contracts/src/governance/GovernancePluginsSetup.sol similarity index 98% rename from packages/contracts/src/GovernancePluginsSetup.sol rename to packages/contracts/src/governance/GovernancePluginsSetup.sol index d6fc786..7d414c1 100644 --- a/packages/contracts/src/GovernancePluginsSetup.sol +++ b/packages/contracts/src/governance/GovernancePluginsSetup.sol @@ -8,8 +8,8 @@ import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; import {PluginSetup, IPluginSetup} from "@aragon/osx/framework/plugin/setup/PluginSetup.sol"; import {PluginSetupProcessor} from "@aragon/osx/framework/plugin/setup/PluginSetupProcessor.sol"; import {MemberAccessPlugin} from "./MemberAccessPlugin.sol"; -import {MemberAccessExecuteCondition} from "./MemberAccessExecuteCondition.sol"; -import {OnlyPluginUpgraderCondition} from "./OnlyPluginUpgraderCondition.sol"; +import {MemberAccessExecuteCondition} from "../conditions/MemberAccessExecuteCondition.sol"; +import {OnlyPluginUpgraderCondition} from "../conditions/OnlyPluginUpgraderCondition.sol"; import {MainVotingPlugin} from "./MainVotingPlugin.sol"; import {MajorityVotingBase} from "@aragon/osx/plugins/governance/majority-voting/MajorityVotingBase.sol"; diff --git a/packages/contracts/src/MainVotingPlugin.sol b/packages/contracts/src/governance/MainVotingPlugin.sol similarity index 99% rename from packages/contracts/src/MainVotingPlugin.sol rename to packages/contracts/src/governance/MainVotingPlugin.sol index 1e6e739..c3e979c 100644 --- a/packages/contracts/src/MainVotingPlugin.sol +++ b/packages/contracts/src/governance/MainVotingPlugin.sol @@ -9,7 +9,7 @@ import {Addresslist} from "@aragon/osx/plugins/utils/Addresslist.sol"; import {RATIO_BASE, _applyRatioCeiled} from "@aragon/osx/plugins/utils/Ratio.sol"; import {IMajorityVoting} from "@aragon/osx/plugins/governance/majority-voting/IMajorityVoting.sol"; import {MajorityVotingBase} from "@aragon/osx/plugins/governance/majority-voting/MajorityVotingBase.sol"; -import {MEMBER_PERMISSION_ID} from "./constants.sol"; +import {MEMBER_PERMISSION_ID} from "../constants.sol"; // The [ERC-165](https://eips.ethereum.org/EIPS/eip-165) interface ID of the contract. bytes4 constant MAIN_SPACE_VOTING_INTERFACE_ID = MainVotingPlugin.initialize.selector ^ diff --git a/packages/contracts/src/MemberAccessPlugin.sol b/packages/contracts/src/governance/MemberAccessPlugin.sol similarity index 99% rename from packages/contracts/src/MemberAccessPlugin.sol rename to packages/contracts/src/governance/MemberAccessPlugin.sol index 48d1e42..22f0ae5 100644 --- a/packages/contracts/src/MemberAccessPlugin.sol +++ b/packages/contracts/src/governance/MemberAccessPlugin.sol @@ -10,7 +10,7 @@ import {PluginUUPSUpgradeable} from "@aragon/osx/core/plugin/PluginUUPSUpgradeab import {ProposalUpgradeable} from "@aragon/osx/core/plugin/proposal/ProposalUpgradeable.sol"; import {IMultisig} from "@aragon/osx/plugins/governance/multisig/IMultisig.sol"; import {MainVotingPlugin, MAIN_SPACE_VOTING_INTERFACE_ID} from "./MainVotingPlugin.sol"; -import {MEMBER_PERMISSION_ID} from "./constants.sol"; +import {MEMBER_PERMISSION_ID} from "../constants.sol"; bytes4 constant MEMBER_ACCESS_INTERFACE_ID = MemberAccessPlugin.initialize.selector ^ MemberAccessPlugin.updateMultisigSettings.selector ^ diff --git a/packages/contracts/src/governance-build-metadata.json b/packages/contracts/src/governance/governance-build-metadata.json similarity index 100% rename from packages/contracts/src/governance-build-metadata.json rename to packages/contracts/src/governance/governance-build-metadata.json diff --git a/packages/contracts/src/governance-release-metadata.json b/packages/contracts/src/governance/governance-release-metadata.json similarity index 100% rename from packages/contracts/src/governance-release-metadata.json rename to packages/contracts/src/governance/governance-release-metadata.json diff --git a/packages/contracts/src/PersonalSpaceAdminPlugin.sol b/packages/contracts/src/personal/PersonalSpaceAdminPlugin.sol similarity index 97% rename from packages/contracts/src/PersonalSpaceAdminPlugin.sol rename to packages/contracts/src/personal/PersonalSpaceAdminPlugin.sol index a0acd10..097e66d 100644 --- a/packages/contracts/src/PersonalSpaceAdminPlugin.sol +++ b/packages/contracts/src/personal/PersonalSpaceAdminPlugin.sol @@ -5,7 +5,7 @@ import {SafeCastUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/mat import {ProposalUpgradeable} from "@aragon/osx/core/plugin/proposal/ProposalUpgradeable.sol"; import {PluginCloneable} from "@aragon/osx/core/plugin/PluginCloneable.sol"; import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; -import {EDITOR_PERMISSION_ID, MEMBER_PERMISSION_ID} from "./constants.sol"; +import {EDITOR_PERMISSION_ID, MEMBER_PERMISSION_ID} from "../constants.sol"; /// @title PersonalSpaceAdminPlugin /// @author Aragon - 2023 diff --git a/packages/contracts/src/PersonalSpaceAdminPluginSetup.sol b/packages/contracts/src/personal/PersonalSpaceAdminPluginSetup.sol similarity index 98% rename from packages/contracts/src/PersonalSpaceAdminPluginSetup.sol rename to packages/contracts/src/personal/PersonalSpaceAdminPluginSetup.sol index 640519e..20dca04 100644 --- a/packages/contracts/src/PersonalSpaceAdminPluginSetup.sol +++ b/packages/contracts/src/personal/PersonalSpaceAdminPluginSetup.sol @@ -9,7 +9,7 @@ import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; import {DAO} from "@aragon/osx/core/dao/DAO.sol"; import {PermissionLib} from "@aragon/osx/core/permission/PermissionLib.sol"; import {PersonalSpaceAdminPlugin} from "./PersonalSpaceAdminPlugin.sol"; -import {EDITOR_PERMISSION_ID} from "./constants.sol"; +import {EDITOR_PERMISSION_ID} from "../constants.sol"; /// @title PersonalSpaceAdminPluginSetup /// @author Aragon - 2023 diff --git a/packages/contracts/src/personal-space-admin-build-metadata.json b/packages/contracts/src/personal/personal-space-admin-build-metadata.json similarity index 100% rename from packages/contracts/src/personal-space-admin-build-metadata.json rename to packages/contracts/src/personal/personal-space-admin-build-metadata.json diff --git a/packages/contracts/src/personal-space-admin-release-metadata.json b/packages/contracts/src/personal/personal-space-admin-release-metadata.json similarity index 100% rename from packages/contracts/src/personal-space-admin-release-metadata.json rename to packages/contracts/src/personal/personal-space-admin-release-metadata.json diff --git a/packages/contracts/src/SpacePlugin.sol b/packages/contracts/src/space/SpacePlugin.sol similarity index 98% rename from packages/contracts/src/SpacePlugin.sol rename to packages/contracts/src/space/SpacePlugin.sol index e733916..45e3218 100644 --- a/packages/contracts/src/SpacePlugin.sol +++ b/packages/contracts/src/space/SpacePlugin.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.8; import {IDAO, PluginUUPSUpgradeable} from "@aragon/osx/core/plugin/PluginUUPSUpgradeable.sol"; -import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "./constants.sol"; +import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "../constants.sol"; bytes4 constant SPACE_INTERFACE_ID = SpacePlugin.initialize.selector ^ SpacePlugin.processGeoProposal.selector ^ diff --git a/packages/contracts/src/SpacePluginSetup.sol b/packages/contracts/src/space/SpacePluginSetup.sol similarity index 97% rename from packages/contracts/src/SpacePluginSetup.sol rename to packages/contracts/src/space/SpacePluginSetup.sol index c95a3e5..8ad2c7e 100644 --- a/packages/contracts/src/SpacePluginSetup.sol +++ b/packages/contracts/src/space/SpacePluginSetup.sol @@ -8,8 +8,8 @@ import {PermissionLib} from "@aragon/osx/core/permission/PermissionLib.sol"; import {PluginSetup, IPluginSetup} from "@aragon/osx/framework/plugin/setup/PluginSetup.sol"; import {PluginSetupProcessor} from "@aragon/osx/framework/plugin/setup/PluginSetupProcessor.sol"; import {SpacePlugin} from "./SpacePlugin.sol"; -import {OnlyPluginUpgraderCondition} from "./OnlyPluginUpgraderCondition.sol"; -import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "./constants.sol"; +import {OnlyPluginUpgraderCondition} from "../conditions/OnlyPluginUpgraderCondition.sol"; +import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "../constants.sol"; /// @title SpacePluginSetup /// @dev Release 1, Build 1 diff --git a/packages/contracts/src/space-build-metadata.json b/packages/contracts/src/space/space-build-metadata.json similarity index 100% rename from packages/contracts/src/space-build-metadata.json rename to packages/contracts/src/space/space-build-metadata.json diff --git a/packages/contracts/src/space-release-metadata.json b/packages/contracts/src/space/space-release-metadata.json similarity index 100% rename from packages/contracts/src/space-release-metadata.json rename to packages/contracts/src/space/space-release-metadata.json diff --git a/packages/contracts/src/test/PersonalSpaceAdminCloneFactory.sol b/packages/contracts/src/test/PersonalSpaceAdminCloneFactory.sol index 6bd91ea..bcf9f00 100644 --- a/packages/contracts/src/test/PersonalSpaceAdminCloneFactory.sol +++ b/packages/contracts/src/test/PersonalSpaceAdminCloneFactory.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.17; import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol"; -import {PersonalSpaceAdminPlugin} from "../PersonalSpaceAdminPlugin.sol"; +import {PersonalSpaceAdminPlugin} from "../personal/PersonalSpaceAdminPlugin.sol"; contract PersonalSpaceAdminCloneFactory { using Clones for address; diff --git a/packages/contracts/src/test/TestGovernancePluginsSetup.sol b/packages/contracts/src/test/TestGovernancePluginsSetup.sol index ca21658..a3a2743 100644 --- a/packages/contracts/src/test/TestGovernancePluginsSetup.sol +++ b/packages/contracts/src/test/TestGovernancePluginsSetup.sol @@ -8,9 +8,9 @@ import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; import {PluginSetup, IPluginSetup} from "@aragon/osx/framework/plugin/setup/PluginSetup.sol"; import {PluginSetupProcessor} from "@aragon/osx/framework/plugin/setup/PluginSetupProcessor.sol"; import {TestMemberAccessPlugin} from "./TestMemberAccessPlugin.sol"; -import {MemberAccessExecuteCondition} from "../MemberAccessExecuteCondition.sol"; -import {OnlyPluginUpgraderCondition} from "../OnlyPluginUpgraderCondition.sol"; -import {MainVotingPlugin} from "../MainVotingPlugin.sol"; +import {MemberAccessExecuteCondition} from "../conditions/MemberAccessExecuteCondition.sol"; +import {OnlyPluginUpgraderCondition} from "../conditions/OnlyPluginUpgraderCondition.sol"; +import {MainVotingPlugin} from "../governance/MainVotingPlugin.sol"; import {MajorityVotingBase} from "@aragon/osx/plugins/governance/majority-voting/MajorityVotingBase.sol"; // Not ideal, but to test this E2E, the contract needs to be cloned diff --git a/packages/contracts/src/test/TestMemberAccessPlugin.sol b/packages/contracts/src/test/TestMemberAccessPlugin.sol index 8eb3da4..5bcdf0d 100644 --- a/packages/contracts/src/test/TestMemberAccessPlugin.sol +++ b/packages/contracts/src/test/TestMemberAccessPlugin.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.8; import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; -import {MemberAccessPlugin} from "../MemberAccessPlugin.sol"; +import {MemberAccessPlugin} from "../governance/MemberAccessPlugin.sol"; /// @notice A clone of the MemberAccessPlugin contract, just to test contract TestMemberAccessPlugin is MemberAccessPlugin { diff --git a/packages/contracts/test/unit-testing/governance-plugins-setup.ts b/packages/contracts/test/unit-testing/governance-plugins-setup.ts index 83346bb..f08a5e3 100644 --- a/packages/contracts/test/unit-testing/governance-plugins-setup.ts +++ b/packages/contracts/test/unit-testing/governance-plugins-setup.ts @@ -1,4 +1,4 @@ -import buildMetadata from '../../src/governance-build-metadata.json'; +import buildMetadata from '../../src/governance/governance-build-metadata.json'; import { DAO, GovernancePluginsSetup, diff --git a/packages/contracts/test/unit-testing/personal-space-admin-plugin-setup.ts b/packages/contracts/test/unit-testing/personal-space-admin-plugin-setup.ts index 86220de..4d38f41 100644 --- a/packages/contracts/test/unit-testing/personal-space-admin-plugin-setup.ts +++ b/packages/contracts/test/unit-testing/personal-space-admin-plugin-setup.ts @@ -1,4 +1,4 @@ -import metadata from '../../src/personal-space-admin-build-metadata.json'; +import metadata from '../../src/personal/personal-space-admin-build-metadata.json'; import { PersonalSpaceAdminPlugin__factory, PersonalSpaceAdminPluginSetup, diff --git a/packages/contracts/test/unit-testing/space-plugin-setup.ts b/packages/contracts/test/unit-testing/space-plugin-setup.ts index 478004b..337d674 100644 --- a/packages/contracts/test/unit-testing/space-plugin-setup.ts +++ b/packages/contracts/test/unit-testing/space-plugin-setup.ts @@ -1,4 +1,4 @@ -import buildMetadata from '../../src/space-build-metadata.json'; +import buildMetadata from '../../src/space/space-build-metadata.json'; import { DAO, SpacePlugin__factory,