From 26902675b2e55c060e9c892db1d2c791509da855 Mon Sep 17 00:00:00 2001 From: Giorgi Lagidze Date: Sat, 28 Sep 2024 12:28:16 +0400 Subject: [PATCH] callinitialization from osx-commons --- packages/contracts/src/MajorityVotingBase.sol | 2 +- packages/contracts/src/TokenVoting.sol | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/packages/contracts/src/MajorityVotingBase.sol b/packages/contracts/src/MajorityVotingBase.sol index c551e145..678c11f3 100644 --- a/packages/contracts/src/MajorityVotingBase.sol +++ b/packages/contracts/src/MajorityVotingBase.sol @@ -13,7 +13,7 @@ import {RATIO_BASE, RatioOutOfBounds} from "@aragon/osx-commons-contracts/src/ut import {PluginUUPSUpgradeable} from "@aragon/osx-commons-contracts/src/plugin/PluginUUPSUpgradeable.sol"; import {IDAO} from "@aragon/osx-commons-contracts/src/dao/IDAO.sol"; import {IProposal} from "@aragon/osx-commons-contracts/src/plugin/extensions/proposal/IProposal.sol"; -import {IExecutor, Action} from "@aragon/osx-commons-contracts/src/executors/IExecutor.sol"; +import {Action} from "@aragon/osx-commons-contracts/src/executors/IExecutor.sol"; import {IMajorityVoting} from "./IMajorityVoting.sol"; diff --git a/packages/contracts/src/TokenVoting.sol b/packages/contracts/src/TokenVoting.sol index f309d5f6..8bfefa71 100644 --- a/packages/contracts/src/TokenVoting.sol +++ b/packages/contracts/src/TokenVoting.sol @@ -11,7 +11,7 @@ import {_applyRatioCeiled} from "@aragon/osx-commons-contracts/src/utils/math/Ra import {IDAO} from "@aragon/osx-commons-contracts/src/dao/IDAO.sol"; import {IProposal} from "@aragon/osx-commons-contracts/src/plugin/extensions/proposal/IProposal.sol"; -import {IExecutor, Action} from "@aragon/osx-commons-contracts/src/executors/IExecutor.sol"; +import {Action} from "@aragon/osx-commons-contracts/src/executors/IExecutor.sol"; import {MajorityVotingBase} from "./MajorityVotingBase.sol"; @@ -35,18 +35,6 @@ contract TokenVoting is IMembership, MajorityVotingBase { /// @notice Thrown if the voting power is zero error NoVotingPower(); - /// @notice Thrown when initialize is called after it has already been executed. - error AlreadyInitialized(); - - /// @notice This ensures that the initialize function cannot be called during the upgrade process. - modifier onlyCallAtInitialization() { - if (_getInitializedVersion() != 0) { - revert AlreadyInitialized(); - } - - _; - } - /// @notice Initializes the component. /// @dev This method is required to support [ERC-1822](https://eips.ethereum.org/EIPS/eip-1822). /// @param _dao The IDAO interface of the associated DAO.