test: fix events and re-enable tests

PaulRBerg · Jun 22, 2023 · f4ac54b · f4ac54b
1 parent 37dc8be
commit f4ac54b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/test/registry/install-plugin/installPlugin.t.sol b/test/registry/install-plugin/installPlugin.t.sol
@@ -69,8 +69,7 @@ contract InstallPlugin_Test is Registry_Test {
         }
     }
 
-    // TODO: re-enable this test once this bug is fixed https://github.com/foundry-rs/foundry/pull/4920
-    function test_InstallPlugin_Event() private whenCallerHasProxy whenPluginListNotEmpty whenPluginNotInstalled {
+    function test_InstallPlugin_Event() external whenCallerHasProxy whenPluginListNotEmpty whenPluginNotInstalled {
         vm.expectEmit({ emitter: address(registry) });
         emit InstallPlugin({ owner: users.alice, proxy: proxy, plugin: plugins.dummy });
         registry.installPlugin(plugins.dummy);

diff --git a/test/registry/set-permission/setPermission.t.sol b/test/registry/set-permission/setPermission.t.sol
@@ -38,8 +38,7 @@ contract SetPermission_Test is Registry_Test {
         assertTrue(permission, "permission mismatch");
     }
 
-    // TODO: re-enable this test once this bug is fixed https://github.com/foundry-rs/foundry/pull/4920
-    function test_SetPermission_ResetPermission_Event() private whenCallerHasProxy whenPermissionSet {
+    function test_SetPermission_ResetPermission_Event() external whenCallerHasProxy whenPermissionSet {
         vm.expectEmit({ emitter: address(registry) });
         emit SetPermission({
             owner: users.alice,
@@ -55,8 +54,7 @@ contract SetPermission_Test is Registry_Test {
         registry.setPermission({ envoy: users.envoy, target: address(targets.dummy), permission: false });
     }
 
-    // TODO: re-enable this test once this bug is fixed https://github.com/foundry-rs/foundry/pull/4920
-    function test_SetPermission_UnsetPermission_Event() private whenCallerHasProxy whenPermissionSet {
+    function test_SetPermission_UnsetPermission_Event() external whenCallerHasProxy whenPermissionSet {
         vm.expectEmit({ emitter: address(registry) });
         emit SetPermission({
             owner: users.alice,

diff --git a/test/registry/uninstall-plugin/uninstallPlugin.t.sol b/test/registry/uninstall-plugin/uninstallPlugin.t.sol
@@ -63,8 +63,7 @@ contract UninstallPlugin_Test is Registry_Test {
         }
     }
 
-    // TODO: re-enable this test once this bug is fixed https://github.com/foundry-rs/foundry/pull/4920
-    function test_UninstallPlugin_Event() private whenCallerHasProxy whenPluginHasMethods whenPluginInstalled {
+    function test_UninstallPlugin_Event() external whenCallerHasProxy whenPluginHasMethods whenPluginInstalled {
         vm.expectEmit({ emitter: address(registry) });
         emit UninstallPlugin({ owner: users.alice, proxy: proxy, plugin: plugins.dummy });
         registry.uninstallPlugin(plugins.dummy);

diff --git a/test/utils/Events.sol b/test/utils/Events.sol
@@ -27,9 +27,11 @@ abstract contract Events {
         IPRBProxy proxy
     );
 
-    event InstallPlugin(address owner, IPRBProxy proxy, IPRBProxyPlugin indexed plugin);
+    event InstallPlugin(address indexed owner, IPRBProxy indexed proxy, IPRBProxyPlugin indexed plugin);
 
-    event SetPermission(address owner, IPRBProxy proxy, address indexed envoy, address indexed target, bool permission);
+    event SetPermission(
+        address indexed owner, IPRBProxy indexed proxy, address indexed envoy, address target, bool permission
+    );
 
-    event UninstallPlugin(address owner, IPRBProxy proxy, IPRBProxyPlugin indexed plugin);
+    event UninstallPlugin(address indexed owner, IPRBProxy indexed proxy, IPRBProxyPlugin indexed plugin);
 }