From ce941dd409c795563592c443c680114e9adc62bc Mon Sep 17 00:00:00 2001
From: Gary Ghayrat <61768337+garyghayrat@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:21:16 -0400
Subject: [PATCH] Add onchain governor addresses to `timelockRolesUpgrader`
 test (#1)

* Add onchain governor addrs to timelockRolesUpgrader tests

* Remove addr arguments
---
 script/DeployTimelockRolesUpgrader.s.sol | 9 +++------
 test/util/SetupNewGovernors.sol          | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/script/DeployTimelockRolesUpgrader.s.sol b/script/DeployTimelockRolesUpgrader.s.sol
index ea61a2f6..3fce13fe 100644
--- a/script/DeployTimelockRolesUpgrader.s.sol
+++ b/script/DeployTimelockRolesUpgrader.s.sol
@@ -9,18 +9,15 @@ import {TimelockRolesUpgrader} from
 import {SharedGovernorConstants} from "script/SharedGovernorConstants.sol";
 
 contract DeployTimelockRolesUpgrader is BaseDeployer, SharedGovernorConstants {
-    function run(address _newCoreGovernor, address _newTreasuryGovernor)
-        public
-        returns (TimelockRolesUpgrader timelockRolesUpgrader)
-    {
+    function run() public returns (TimelockRolesUpgrader timelockRolesUpgrader) {
         vm.startBroadcast();
         timelockRolesUpgrader = new TimelockRolesUpgrader(
             L2_CORE_GOVERNOR_TIMELOCK,
             L2_CORE_GOVERNOR,
-            _newCoreGovernor,
+            L2_CORE_GOVERNOR_ONCHAIN,
             L2_TREASURY_GOVERNOR_TIMELOCK,
             L2_TREASURY_GOVERNOR,
-            _newTreasuryGovernor
+            L2_TREASURY_GOVERNOR_ONCHAIN
         );
         vm.stopBroadcast();
     }
diff --git a/test/util/SetupNewGovernors.sol b/test/util/SetupNewGovernors.sol
index f5a4137f..f206a13e 100644
--- a/test/util/SetupNewGovernors.sol
+++ b/test/util/SetupNewGovernors.sol
@@ -75,8 +75,7 @@ abstract contract SetupNewGovernors is SharedGovernorConstants, Test {
         // Prepare the script to submit upgrade proposal
         submitUpgradeProposalScript = new SubmitUpgradeProposalScript();
         DeployTimelockRolesUpgrader deployTimelockRolesUpgrader = new DeployTimelockRolesUpgrader();
-        timelockRolesUpgrader =
-            deployTimelockRolesUpgrader.run(address(newCoreGovernor), address(newTreasuryGovernor));
+        timelockRolesUpgrader = deployTimelockRolesUpgrader.run();
     }
 }