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

4
contracts/mocks/UUPS/UUPSLegacy.sol
View File

@ -48,11 +48,11 @@ contract UUPSUpgradeableLegacyMock is UUPSUpgradeableMock {
}
// hooking into the old mechanism
function upgradeTo(address newImplementation) external virtual override {
function upgradeTo(address newImplementation) external override {
_upgradeToAndCallSecureLegacyV1(newImplementation, bytes(""), false);
}
function upgradeToAndCall(address newImplementation, bytes memory data) external payable virtual override {
function upgradeToAndCall(address newImplementation, bytes memory data) external payable override {
_upgradeToAndCallSecureLegacyV1(newImplementation, data, false);
}
}

6
contracts/mocks/UUPS/UUPSUpgradeableMock.sol
View File

@ -7,15 +7,15 @@ import "../../proxy/utils/UUPSUpgradeable.sol";
contract UUPSUpgradeableMock is CountersImpl, UUPSUpgradeable {
// Not having any checks in this function is dangerous! Do not do this outside tests!
function _authorizeUpgrade(address) internal virtual override {}
function _authorizeUpgrade(address) internal override {}
}
contract UUPSUpgradeableUnsafeMock is UUPSUpgradeableMock {
function upgradeTo(address newImplementation) external virtual override {
function upgradeTo(address newImplementation) external override {
ERC1967Upgrade._upgradeToAndCall(newImplementation, bytes(""), false);
}
function upgradeToAndCall(address newImplementation, bytes memory data) external payable virtual override {
function upgradeToAndCall(address newImplementation, bytes memory data) external payable override {
ERC1967Upgrade._upgradeToAndCall(newImplementation, data, false);
}
}