From 8631fafb1dcce34544fe9510b8654f2a3ae956e9 Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Fri, 16 Jun 2023 19:16:13 +0200
Subject: [PATCH] remove UUPSLegacy testing

---
 contracts/mocks/proxy/UUPSLegacy.sol     | 54 ------------------------
 test/proxy/utils/UUPSUpgradeable.test.js | 15 -------
 2 files changed, 69 deletions(-)
 delete mode 100644 contracts/mocks/proxy/UUPSLegacy.sol

diff --git a/contracts/mocks/proxy/UUPSLegacy.sol b/contracts/mocks/proxy/UUPSLegacy.sol
deleted file mode 100644
index 6812f39b7ed..00000000000
--- a/contracts/mocks/proxy/UUPSLegacy.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.19;
-
-import "./UUPSUpgradeableMock.sol";
-
-// This contract implements the pre-4.5 UUPS upgrade function with a rollback test.
-// It's used to test that newer UUPS contracts are considered valid upgrades by older UUPS contracts.
-contract UUPSUpgradeableLegacyMock is UUPSUpgradeableMock {
-    // Inlined from ERC1967Utils
-    bytes32 private constant _ROLLBACK_SLOT = 0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143;
-
-    // ERC1967Utils._setImplementation is private so we reproduce it here.
-    // An extra underscore prevents a name clash error.
-    function __setImplementation(address newImplementation) private {
-        require(newImplementation.code.length > 0, "ERC1967: new implementation is not a contract");
-        StorageSlot.getAddressSlot(ERC1967Utils.IMPLEMENTATION_SLOT).value = newImplementation;
-    }
-
-    function _upgradeToAndCallSecureLegacyV1(address newImplementation, bytes memory data, bool forceCall) internal {
-        address oldImplementation = ERC1967Utils.getImplementation();
-
-        // Initial upgrade and setup call
-        __setImplementation(newImplementation);
-        if (data.length > 0 || forceCall) {
-            Address.functionDelegateCall(newImplementation, data);
-        }
-
-        // Perform rollback test if not already in progress
-        StorageSlot.BooleanSlot storage rollbackTesting = StorageSlot.getBooleanSlot(_ROLLBACK_SLOT);
-        if (!rollbackTesting.value) {
-            // Trigger rollback using upgradeTo from the new implementation
-            rollbackTesting.value = true;
-            Address.functionDelegateCall(newImplementation, abi.encodeCall(this.upgradeTo, (oldImplementation)));
-            rollbackTesting.value = false;
-            // Check rollback was effective
-            require(
-                oldImplementation == ERC1967Utils.getImplementation(),
-                "ERC1967Utils: upgrade breaks further upgrades"
-            );
-            // Finally reset to the new implementation and log the upgrade
-            ERC1967Utils.upgradeTo(newImplementation);
-        }
-    }
-
-    // hooking into the old mechanism
-    function upgradeTo(address newImplementation) public override {
-        _upgradeToAndCallSecureLegacyV1(newImplementation, bytes(""), false);
-    }
-
-    function upgradeToAndCall(address newImplementation, bytes memory data) public payable override {
-        _upgradeToAndCallSecureLegacyV1(newImplementation, data, false);
-    }
-}
diff --git a/test/proxy/utils/UUPSUpgradeable.test.js b/test/proxy/utils/UUPSUpgradeable.test.js
index ed2d2ce04ed..ac9198cb682 100644
--- a/test/proxy/utils/UUPSUpgradeable.test.js
+++ b/test/proxy/utils/UUPSUpgradeable.test.js
@@ -6,7 +6,6 @@ const { expectRevertCustomError } = require('../../helpers/customError');
 const ERC1967Proxy = artifacts.require('ERC1967Proxy');
 const UUPSUpgradeableMock = artifacts.require('UUPSUpgradeableMock');
 const UUPSUpgradeableUnsafeMock = artifacts.require('UUPSUpgradeableUnsafeMock');
-const UUPSUpgradeableLegacyMock = artifacts.require('UUPSUpgradeableLegacyMock');
 const NonUpgradeableMock = artifacts.require('NonUpgradeableMock');
 
 contract('UUPSUpgradeable', function () {
@@ -63,18 +62,4 @@ contract('UUPSUpgradeable', function () {
       otherInstance.address,
     ]);
   });
-
-  it('can upgrade from legacy implementations', async function () {
-    const legacyImpl = await UUPSUpgradeableLegacyMock.new();
-    const legacyInstance = await ERC1967Proxy.new(legacyImpl.address, '0x').then(({ address }) =>
-      UUPSUpgradeableLegacyMock.at(address),
-    );
-
-    const receipt = await legacyInstance.upgradeTo(this.implInitial.address);
-    expectEvent(receipt, 'Upgraded', { implementation: this.implInitial.address });
-
-    const implementationSlot = await getSlot(legacyInstance, ImplementationSlot);
-    const implementationAddress = web3.utils.toChecksumAddress(implementationSlot.substr(-40));
-    expect(implementationAddress).to.be.equal(this.implInitial.address);
-  });
 });