@@ -66,11 +66,12 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
6666 }
6767
6868 /// @notice Struct for storing explicit data for each proposal type.
69- /// @param requiredApprovals The number of approvals each proposal type requires in order to be able to move for voting.
70- /// @param proposalTypeConfigurator The voting module each proposal type must use.
69+ /// @param requiredApprovals The number of approvals each proposal type requires in order to be able to move for
70+ /// voting.
71+ /// @param proposalVotingModule The voting module each proposal type must use.
7172 struct ProposalTypeData {
7273 uint256 requiredApprovals;
73- uint8 proposalTypeConfigurator ;
74+ uint8 proposalVotingModule ;
7475 }
7576
7677 /// @notice Struct for storing voting cycle data.
@@ -113,7 +114,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
113114 /// @param calldatas Function data for proposal calls.
114115 /// @param description Description of the proposal.
115116 /// @param proposalType Type of the proposal.
116- /// @param proposalTypeConfigurator Configuration value specific to the proposal type.
117+ /// @param proposalVotingModule Voting module specific to the proposal type.
117118 event ProposalSubmitted (
118119 bytes32 indexed proposalHash ,
119120 address indexed proposer ,
@@ -122,7 +123,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
122123 bytes [] calldatas ,
123124 string description ,
124125 ProposalType proposalType ,
125- uint8 proposalTypeConfigurator
126+ uint8 proposalVotingModule
126127 );
127128
128129 /// @notice Emitted when a delegate approves a proposal.
@@ -155,8 +156,8 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
155156 /// @notice Emitted when the proposal type data is set.
156157 /// @param proposalType The type of proposal.
157158 /// @param requiredApprovals The required number of approvals.
158- /// @param proposalTypeConfigurator The proposal type configurator .
159- event ProposalTypeDataSet (ProposalType proposalType , uint256 requiredApprovals , uint8 proposalTypeConfigurator );
159+ /// @param proposalVotingModule The proposal voting module .
160+ event ProposalTypeDataSet (ProposalType proposalType , uint256 requiredApprovals , uint8 proposalVotingModule );
160161
161162 /// @notice The schema UID for attestations in the Ethereum Attestation Service.
162163 /// @dev Schema format: { approvedProposer: address, proposalType: uint8 }
@@ -287,7 +288,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
287288 _calldatas,
288289 _description,
289290 _proposalType,
290- proposalTypeData.proposalTypeConfigurator
291+ proposalTypeData.proposalVotingModule
291292 );
292293 }
293294
@@ -346,7 +347,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
346347 proposal.inVoting = true ;
347348
348349 governorProposalId_ =
349- GOVERNOR.propose (_targets, _values, _calldatas, _description, proposalTypeData.proposalTypeConfigurator );
350+ GOVERNOR.propose (_targets, _values, _calldatas, _description, proposalTypeData.proposalVotingModule );
350351
351352 emit ProposalMovedToVote (_proposalHash, msg .sender );
352353 }
@@ -511,7 +512,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
511512 function _setProposalTypeData (ProposalType _proposalType , ProposalTypeData memory _proposalTypeData ) private {
512513 proposalTypesData[_proposalType] = _proposalTypeData;
513514 emit ProposalTypeDataSet (
514- _proposalType, _proposalTypeData.requiredApprovals, _proposalTypeData.proposalTypeConfigurator
515+ _proposalType, _proposalTypeData.requiredApprovals, _proposalTypeData.proposalVotingModule
515516 );
516517 }
517518}
0 commit comments