fix: rm guardian

marsfoundation · Oct 2, 2024 · b4cdc4e · b4cdc4e
1 parent 875bc77
commit b4cdc4e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/deploy/Deploy.sol b/deploy/Deploy.sol
@@ -19,15 +19,14 @@ library Deploy {
         receiver = address(new OptimismReceiver(l1Authority, executor));
     }
 
-    function setUpExecutorPermissions(address executor_, address receiver, address guardian)
+    function setUpExecutorPermissions(address executor_, address receiver)
         internal
     {
         // NOTE: Using implementation instead of interface because OZ didn't define
         //       DEFAULT_ADMIN_ROLE in the IAccessControl interface.
         Executor executor = Executor(executor_);
 
         executor.grantRole(executor.SUBMISSION_ROLE(),     receiver);
-        executor.grantRole(executor.GUARDIAN_ROLE(),       guardian);
         executor.revokeRole(executor.DEFAULT_ADMIN_ROLE(), address(this));
     }
 

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -11,10 +11,9 @@ contract DeployBaseExecutor is Script {
 
     function run() public {
         address executor = Deploy.deployExecutor(100, 1000);
-
         address receiver = Deploy.deployOptimismReceiver(Ethereum.SPARK_PROXY, executor);
 
-        // TODO: What is guardian here?
-        Deploy.setUpExecutorPermissions(executor, receiver, address(1));
+        Deploy.setUpExecutorPermissions(executor, receiver);
     }
+
 }
diff --git a/test/Deploy.t.sol b/test/Deploy.t.sol
@@ -35,13 +35,11 @@ contract DeployTests is Test {
         );
 
         assertEq(executor.hasRole(executor.SUBMISSION_ROLE(),    address(receiver)),    false);
-        assertEq(executor.hasRole(executor.GUARDIAN_ROLE(),      makeAddr("guardian")), false);
         assertEq(executor.hasRole(executor.DEFAULT_ADMIN_ROLE(), address(this)),        true);
 
-        Deploy.setUpExecutorPermissions(address(executor), address(receiver), makeAddr("guardian"));
+        Deploy.setUpExecutorPermissions(address(executor), address(receiver));
 
         assertEq(executor.hasRole(executor.SUBMISSION_ROLE(),    address(receiver)),    true);
-        assertEq(executor.hasRole(executor.GUARDIAN_ROLE(),      makeAddr("guardian")), true);
         assertEq(executor.hasRole(executor.DEFAULT_ADMIN_ROLE(), address(this)),        false);
     }