Remove repeated code from ERC1967Upgrade (#2720)

Amxx · web-flow · commit 6f50f6e1ef97 · 2021-06-14T18:50:51.000-03:00
diff --git a/contracts/proxy/ERC1967/ERC1967Upgrade.sol b/contracts/proxy/ERC1967/ERC1967Upgrade.sol
@@ -65,8 +65,7 @@ abstract contract ERC1967Upgrade {
         bytes memory data,
         bool forceCall
     ) internal {
-        _setImplementation(newImplementation);
-        emit Upgraded(newImplementation);
+        _upgradeTo(newImplementation);
         if (data.length > 0 || forceCall) {
             Address.functionDelegateCall(newImplementation, data);
         }
@@ -103,8 +102,7 @@ abstract contract ERC1967Upgrade {
             // Check rollback was effective
             require(oldImplementation == _getImplementation(), "ERC1967Upgrade: upgrade breaks further upgrades");
             // Finally reset to the new implementation and log the upgrade
-            _setImplementation(newImplementation);
-            emit Upgraded(newImplementation);
+            _upgradeTo(newImplementation);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ abstract contract ERC1967Upgrade {`
`65`	`65`	`bytes memory data,`
`66`	`66`	`bool forceCall`
`67`	`67`	`) internal {`
`68`		`- _setImplementation(newImplementation);`
`69`		`- emit Upgraded(newImplementation);`
	`68`	`+ _upgradeTo(newImplementation);`
`70`	`69`	`if (data.length > 0 \|\| forceCall) {`
`71`	`70`	`Address.functionDelegateCall(newImplementation, data);`
`72`	`71`	`}`
`@@ -103,8 +102,7 @@ abstract contract ERC1967Upgrade {`
`103`	`102`	`// Check rollback was effective`
`104`	`103`	`require(oldImplementation == _getImplementation(), "ERC1967Upgrade: upgrade breaks further upgrades");`
`105`	`104`	`// Finally reset to the new implementation and log the upgrade`
`106`		`- _setImplementation(newImplementation);`
`107`		`- emit Upgraded(newImplementation);`
	`105`	`+ _upgradeTo(newImplementation);`
`108`	`106`	`}`
`109`	`107`	`}`
`110`	`108`