From 2d3c9c81405970a964f76bbc5ffdc99afd2f5a6d Mon Sep 17 00:00:00 2001 From: Jay Paik Date: Mon, 29 Jan 2024 14:47:48 -0500 Subject: [PATCH] fix: rename error IPluginInterfaceNotAllowed to InterfaceNotAllowed --- src/account/PluginManagerInternals.sol | 6 +++--- test/account/UpgradeableModularAccountPluginManager.t.sol | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/account/PluginManagerInternals.sol b/src/account/PluginManagerInternals.sol index e6bbf8165..9c4e4f501 100644 --- a/src/account/PluginManagerInternals.sol +++ b/src/account/PluginManagerInternals.sol @@ -67,10 +67,10 @@ abstract contract PluginManagerInternals is IPluginManager, AccountStorageV1 { error DuplicatePreUserOpValidationHookLimitExceeded(bytes4 selector, FunctionReference hook); error Erc4337FunctionNotAllowed(bytes4 selector); error ExecutionFunctionAlreadySet(bytes4 selector); - error IPluginFunctionNotAllowed(bytes4 selector); - error IPluginInterfaceNotAllowed(); + error InterfaceNotAllowed(); error InvalidDependenciesProvided(); error InvalidPluginManifest(); + error IPluginFunctionNotAllowed(bytes4 selector); error MissingPluginDependency(address dependency); error NativeFunctionNotAllowed(bytes4 selector); error NullFunctionReference(); @@ -456,7 +456,7 @@ abstract contract PluginManagerInternals is IPluginManager, AccountStorageV1 { for (uint256 i = 0; i < length; ++i) { bytes4 interfaceId = manifest.interfaceIds[i]; if (interfaceId == type(IPlugin).interfaceId || interfaceId == _INVALID_INTERFACE_ID) { - revert IPluginInterfaceNotAllowed(); + revert InterfaceNotAllowed(); } storage_.supportedInterfaces[interfaceId] += 1; } diff --git a/test/account/UpgradeableModularAccountPluginManager.t.sol b/test/account/UpgradeableModularAccountPluginManager.t.sol index 73a5f32f5..a90869fe0 100644 --- a/test/account/UpgradeableModularAccountPluginManager.t.sol +++ b/test/account/UpgradeableModularAccountPluginManager.t.sol @@ -263,7 +263,7 @@ contract UpgradeableModularAccountPluginManagerTest is Test { MockPlugin mockPluginBad = new MockPlugin(manifestBad); bytes32 manifestHashBad = keccak256(abi.encode(mockPluginBad.pluginManifest())); - vm.expectRevert(PluginManagerInternals.IPluginInterfaceNotAllowed.selector); + vm.expectRevert(PluginManagerInternals.InterfaceNotAllowed.selector); IPluginManager(account2).installPlugin({ plugin: address(mockPluginBad), manifestHash: manifestHashBad,