NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary virtual (#3650)

Browse Source
This commit is contained in:
William Entriken
2022-08-31 16:25:54 -04:00
committed by GitHub
parent 4b8b92c8bf
commit 1eb55e2864
20 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contracts/mocks/GovernorTimelockControlMock.sol
View File

@ -31,7 +31,6 @@ contract GovernorTimelockControlMock is
function supportsInterface(bytes4 interfaceId)
public
view
virtual
override(Governor, GovernorTimelockControl)
returns (bool)
{
@ -59,13 +58,7 @@ contract GovernorTimelockControlMock is
/**
* Overriding nightmare
*/
function state(uint256 proposalId)
public
view
virtual
override(Governor, GovernorTimelockControl)
returns (ProposalState)
{
function state(uint256 proposalId) public view override(Governor, GovernorTimelockControl) returns (ProposalState) {
return super.state(proposalId);
}
@ -79,7 +72,7 @@ contract GovernorTimelockControlMock is
uint256[] memory values,
bytes[] memory calldatas,
bytes32 descriptionHash
) internal virtual override(Governor, GovernorTimelockControl) {
) internal override(Governor, GovernorTimelockControl) {
super._execute(proposalId, targets, values, calldatas, descriptionHash);
}
@ -88,11 +81,11 @@ contract GovernorTimelockControlMock is
uint256[] memory values,
bytes[] memory calldatas,
bytes32 descriptionHash
) internal virtual override(Governor, GovernorTimelockControl) returns (uint256 proposalId) {
) internal override(Governor, GovernorTimelockControl) returns (uint256 proposalId) {
return super._cancel(targets, values, calldatas, descriptionHash);
}
function _executor() internal view virtual override(Governor, GovernorTimelockControl) returns (address) {
function _executor() internal view override(Governor, GovernorTimelockControl) returns (address) {
return super._executor();
}