Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: libraries/AccountStorageV1 -> account/AccountStorageV1 #102

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/account/AccountLoupe.sol
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.22;

import {AccountStorageV1} from "../account/AccountStorageV1.sol";
import {KnownSelectors} from "../helpers/KnownSelectors.sol";

import {IAccountLoupe} from "../interfaces/IAccountLoupe.sol";
import {FunctionReference} from "../interfaces/IPluginManager.sol";

import {AccountStorageV1} from "../libraries/AccountStorageV1.sol";
import {CastLib} from "../libraries/CastLib.sol";
import {CountableLinkedListSetLib} from "../libraries/CountableLinkedListSetLib.sol";
import {LinkedListSet, LinkedListSetLib} from "../libraries/LinkedListSetLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/account/AccountStorageInitializable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.22;

import {Address} from "@openzeppelin/contracts/utils/Address.sol";

import {AccountStorageV1} from "../libraries/AccountStorageV1.sol";
import {AccountStorageV1} from "../account/AccountStorageV1.sol";

/// @title Account Storage Initializable
/// @author Alchemy
Expand Down
File renamed without changes.
4 changes: 1 addition & 3 deletions src/account/PluginManagerInternals.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pragma solidity ^0.8.22;

import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";

import {AccountStorageV1} from "../account/AccountStorageV1.sol";
import {KnownSelectors} from "../helpers/KnownSelectors.sol";

import {
IPlugin,
ManifestAssociatedFunction,
Expand All @@ -15,8 +15,6 @@ import {
PluginManifest
} from "../interfaces/IPlugin.sol";
import {FunctionReference, IPluginManager} from "../interfaces/IPluginManager.sol";

import {AccountStorageV1} from "../libraries/AccountStorageV1.sol";
import {CastLib} from "../libraries/CastLib.sol";
import {CountableLinkedListSetLib} from "../libraries/CountableLinkedListSetLib.sol";
import {FunctionReferenceLib} from "../libraries/FunctionReferenceLib.sol";
Expand Down
6 changes: 4 additions & 2 deletions test/libraries/AccountStorage.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
pragma solidity ^0.8.22;

import {Test} from "forge-std/Test.sol";
import {AccountStorageV1} from "../../src/libraries/AccountStorageV1.sol";

import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

import {AccountStorageInitializable} from "../../src/account/AccountStorageInitializable.sol";
import {AccountStorageV1} from "../../src/account/AccountStorageV1.sol";
import {MockDiamondStorageContract} from "../mocks/MockDiamondStorageContract.sol";
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

// Test implementation of AccountStorageInitializable which is contained in UpgradeableModularAccount
contract AccountStorageTest is Test, AccountStorageV1 {
Expand Down
4 changes: 2 additions & 2 deletions test/plugin/TokenReceiverPlugin.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import {ERC721PresetMinterPauserAutoId} from
import {IERC777Recipient} from "@openzeppelin/contracts/token/ERC777/IERC777Recipient.sol";
import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";

import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol";
import {AccountStorageV1} from "../../src/account/AccountStorageV1.sol";
import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
import {FunctionReference} from "../../src/interfaces/IPluginManager.sol";
import {AccountStorageV1} from "../../src/libraries/AccountStorageV1.sol";
import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol";

import {MockERC777} from "../mocks/tokens/MockERC777.sol";
import {MockERC1155} from "../mocks/tokens/MockERC1155.sol";
Expand Down