use the address helper to mock invalid proxy

Author: Amxx

contracts/mocks/proxy/UUPSUpgradeableMock.sol

@@ -29,10 +29,6 @@ contract UUPSUpgradeableUnsafeMock is UUPSUpgradeableMock {
     function upgradeToAndCall(address newImplementation, bytes memory data) public payable override {
         ERC1967Utils.upgradeToAndCall(newImplementation, data, false);
     }
-
-    function functionDelegateCall(address target, bytes memory data) public {
-        Address.functionDelegateCall(target, data);
-    }
 }
 
 contract UUPSUnsupportedProxiableUUID is UUPSUpgradeableMock {

test/proxy/utils/UUPSUpgradeable.test.js

@@ -7,6 +7,7 @@ const UUPSUpgradeableMock = artifacts.require('UUPSUpgradeableMock');
 const UUPSUpgradeableUnsafeMock = artifacts.require('UUPSUpgradeableUnsafeMock');
 const NonUpgradeableMock = artifacts.require('NonUpgradeableMock');
 const UUPSUnsupportedProxiableUUID = artifacts.require('UUPSUnsupportedProxiableUUID');
+const Address = artifacts.require('$Address');
 
 contract('UUPSUpgradeable', function () {
   before(async function () {
@@ -15,6 +16,7 @@ contract('UUPSUpgradeable', function () {
     this.implUpgradeUnsafe = await UUPSUpgradeableUnsafeMock.new();
     this.implUpgradeNonUUPS = await NonUpgradeableMock.new();
     this.implUnsupportedUUID = await UUPSUnsupportedProxiableUUID.new();
+    this.helper = await Address.new();
   });
 
   beforeEach(async function () {
@@ -43,15 +45,15 @@ contract('UUPSUpgradeable', function () {
     expect(await this.instance.current()).to.be.bignumber.equal('1');
   });
 
-  it('rejects upgrading directly from the implementation', async function () {
+  it('calling upgradeTo on the implementation reverts', async function () {
     await expectRevertCustomError(
       this.implInitial.upgradeTo(this.implUpgradeOk.address),
       'UUPSUnauthorizedCallContext',
       [],
     );
   });
 
-  it('rejects upgrading directly from the implementation with call', async function () {
+  it('calling upgradeToAndCall on the implementation reverts', async function () {
     await expectRevertCustomError(
       this.implInitial.upgradeToAndCall(
         this.implUpgradeOk.address,
@@ -62,9 +64,9 @@ contract('UUPSUpgradeable', function () {
     );
   });
 
-  it('rejects upgrading from an invalid proxy', async function () {
+  it('calling upgradeTo from a contract that is not a proxy reverts', async function () {
     await expectRevertCustomError(
-      this.implUpgradeUnsafe.functionDelegateCall(
+      this.helper.$functionDelegateCall(
         this.implUpgradeOk.address,
         this.implUpgradeOk.contract.methods.upgradeTo(this.implUpgradeUnsafe.address).encodeABI(),
       ),
@@ -73,9 +75,9 @@ contract('UUPSUpgradeable', function () {
     );
   });
 
-  it('rejects upgrading from an invalid proxy with call', async function () {
+  it('calling upgradeTo from a contract that is not a proxy reverts', async function () {
     await expectRevertCustomError(
-      this.implUpgradeUnsafe.functionDelegateCall(
+      this.helper.$functionDelegateCall(
         this.implUpgradeOk.address,
         this.implUpgradeOk.contract.methods.upgradeToAndCall(this.implUpgradeUnsafe.address, '0x').encodeABI(),
       ),