move initialize2() into primary initializer

Author: sparrowDom

contracts/contracts/token/WOETH.sol

@@ -41,9 +41,16 @@ contract WOETH is ERC4626, Governable, Initializable {
      */
     function initialize() external onlyGovernor initializer {
         OETH(address(asset())).rebaseOptIn();
+
+        initialize2();
     }
 
-    function initialize2() external onlyGovernor {
+    /**
+     * @notice secondary initializer that newly deployed contracts will execute as part
+     *         of primary initialize function and the existing contracts will have it called
+     *         as a governance operation.
+     */
+    function initialize2() public onlyGovernor {
         require(!_oethCreditsInitialized, "Initialize2 already called");
 
         _oethCreditsInitialized = true;

contracts/deploy/deployActions.js

@@ -1511,7 +1511,6 @@ const deployWOusd = async () => {
 const deployWOeth = async () => {
   const { deployerAddr, governorAddr } = await getNamedAccounts();
   const sDeployer = await ethers.provider.getSigner(deployerAddr);
-  const sGovernor = await ethers.provider.getSigner(governorAddr);
 
   const oeth = await ethers.getContract("OETHProxy");
   const dWrappedOethImpl = await deployWithConfirmation("WOETH", [
@@ -1527,11 +1526,6 @@ const deployWOeth = async () => {
     // eslint-disable-next-line no-unexpected-multiline
     "initialize(address,address,bytes)"
   ](dWrappedOethImpl.address, governorAddr, initData);
-
-  await woeth.connect(sGovernor)[
-    // eslint-disable-next-line no-unexpected-multiline
-    "initialize2()"
-  ]();
 };
 
 const deployOETHSwapper = async () => {