Skip to content

Commit 129625d

Browse files
committed
Cleanup errors and imports
1 parent 12668d4 commit 129625d

11 files changed

+0
-14
lines changed

src/account/AccountLoupe.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {IStandardExecutor} from "../interfaces/IStandardExecutor.sol";
1111
import {
1212
AccountStorage,
1313
getAccountStorage,
14-
getPermittedCallKey,
1514
HookGroup,
1615
toFunctionReferenceArray
1716
} from "../libraries/AccountStorage.sol";

src/account/PluginManagerInternals.sol

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
AccountStorage,
1010
getAccountStorage,
1111
SelectorData,
12-
PermittedCallData,
1312
getPermittedCallKey,
1413
HookGroup,
1514
PermittedExternalCallData
@@ -44,8 +43,6 @@ abstract contract PluginManagerInternals is IPluginManager {
4443
error PluginNotInstalled(address plugin);
4544
error RuntimeValidationFunctionAlreadySet(bytes4 selector, FunctionReference validationFunction);
4645
error UserOpValidationFunctionAlreadySet(bytes4 selector, FunctionReference validationFunction);
47-
error PluginApplyHookCallbackFailed(address providingPlugin, bytes revertReason);
48-
error PluginUnapplyHookCallbackFailed(address providingPlugin, bytes revertReason);
4946

5047
modifier notNullFunction(FunctionReference functionReference) {
5148
if (functionReference.isEmpty()) {

src/interfaces/IPlugin.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ pragma solidity ^0.8.19;
33

44
import {UserOperation} from "@eth-infinitism/account-abstraction/interfaces/UserOperation.sol";
55

6-
import {IPluginManager} from "./IPluginManager.sol";
7-
86
// Forge formatter will displace the first comment for the enum field out of the enum itself,
97
// so annotating here to prevent that.
108
// forgefmt: disable-start

src/plugins/BasePlugin.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {UserOperation} from "@eth-infinitism/account-abstraction/interfaces/User
55
import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
66

77
import {IPlugin, PluginManifest, PluginMetadata} from "../interfaces/IPlugin.sol";
8-
import {IPluginManager} from "../interfaces/IPluginManager.sol";
98

109
/// @title Base contract for plugins
1110
/// @dev Implements ERC-165 to support IPlugin's interface, which is a requirement

test/account/AccountExecHooks.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pragma solidity ^0.8.19;
44
import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
55
import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
66

7-
import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
87
import {
98
IPlugin,
109
ManifestAssociatedFunctionType,

test/account/AccountReturnData.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pragma solidity ^0.8.19;
33

44
import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
55

6-
import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
76
import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
87
import {SingleOwnerPlugin} from "../../src/plugins/owner/SingleOwnerPlugin.sol";
98
import {FunctionReference} from "../../src/libraries/FunctionReferenceLib.sol";

test/account/ExecuteFromPluginPermissions.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {console} from "forge-std/Test.sol";
55

66
import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
77

8-
import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
98
import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
109
import {SingleOwnerPlugin} from "../../src/plugins/owner/SingleOwnerPlugin.sol";
1110
import {FunctionReference} from "../../src/libraries/FunctionReferenceLib.sol";

test/account/ManifestValidity.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pragma solidity ^0.8.19;
33

44
import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
55

6-
import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
76
import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
87
import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
98
import {SingleOwnerPlugin} from "../../src/plugins/owner/SingleOwnerPlugin.sol";

test/account/UpgradeableModularAccount.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol";
1414
import {PluginManifest} from "../../src/interfaces/IPlugin.sol";
1515
import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol";
1616
import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
17-
import {IPluginExecutor} from "../../src/interfaces/IPluginExecutor.sol";
1817
import {Call} from "../../src/interfaces/IStandardExecutor.sol";
1918
import {FunctionReference} from "../../src/libraries/FunctionReferenceLib.sol";
2019
import {IPlugin, PluginManifest} from "../../src/interfaces/IPlugin.sol";

test/account/ValidationIntersection.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pragma solidity ^0.8.19;
44
import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
55
import {UserOperation} from "@eth-infinitism/account-abstraction/interfaces/UserOperation.sol";
66

7-
import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
87
import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
98
import {SingleOwnerPlugin} from "../../src/plugins/owner/SingleOwnerPlugin.sol";
109
import {FunctionReference} from "../../src/libraries/FunctionReferenceLib.sol";

0 commit comments

Comments
 (0)