Skip to content

Commit

Permalink
callinitialization from osx-commons
Browse files Browse the repository at this point in the history
  • Loading branch information
novaknole committed Sep 28, 2024
1 parent 41b5d7f commit 2690267
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
2 changes: 1 addition & 1 deletion packages/contracts/src/MajorityVotingBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
14 changes: 1 addition & 13 deletions packages/contracts/src/TokenVoting.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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.
Expand Down

0 comments on commit 2690267

Please sign in to comment.