chore: rename diamond types to diamond storage

Author: dadadave80

script/DeployDiamond.s.sol

@@ -7,7 +7,7 @@ import {DiamondCutFacet} from "@diamond/facets/DiamondCutFacet.sol";
 import {DiamondLoupeFacet} from "@diamond/facets/DiamondLoupeFacet.sol";
 import {OwnableRolesFacet} from "@diamond/facets/OwnableRolesFacet.sol";
 import {ERC165Init} from "@diamond/initializers/ERC165Init.sol";
-import {FacetCutAction, FacetCut, DiamondArgs} from "@diamond/libraries/types/DiamondTypes.sol";
+import {FacetCutAction, FacetCut, DiamondArgs} from "@diamond/libraries/types/DiamondStorage.sol";
 import {HelperContract} from "@diamond-test/helpers/HelperContract.sol";
 import {DeployDiamondHelper} from "@diamond-test/helpers/DeployDiamondHelper.sol";
 

src/Diamond.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.4;
 
 import {DiamondStorage, LibDiamond} from "@diamond/libraries/LibDiamond.sol";
 import {LibOwnableRoles} from "@diamond/libraries/LibOwnableRoles.sol";
-import {DiamondArgs, FacetCut} from "@diamond/libraries/types/DiamondTypes.sol";
+import {DiamondArgs, FacetCut} from "@diamond/libraries/types/DiamondStorage.sol";
 import {FunctionDoesNotExist} from "@diamond/libraries/errors/DiamondErrors.sol";
 
 /// @notice Implements EIP-2535 Diamond proxy pattern, allowing dynamic addition, replacement, and removal of facets

src/facets/DiamondCutFacet.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 import {IDiamondCut} from "@diamond/interfaces/IDiamondCut.sol";
 import {LibDiamond} from "@diamond/libraries/LibDiamond.sol";
 import {LibOwnableRoles} from "@diamond/libraries/LibOwnableRoles.sol";
-import {FacetCut} from "@diamond/libraries/types/DiamondTypes.sol";
+import {FacetCut} from "@diamond/libraries/types/DiamondStorage.sol";
 
 /// @notice Simple single owner and multiroles authorization mixin.
 /// @author David Dada

src/facets/DiamondLoupeFacet.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.4;
 
 import {DiamondStorage, LibDiamond} from "@diamond/libraries/LibDiamond.sol";
 import {IDiamondLoupe} from "@diamond/interfaces/IDiamondLoupe.sol";
-import {Facet} from "@diamond/libraries/types/DiamondTypes.sol";
+import {Facet} from "@diamond/libraries/types/DiamondStorage.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 /// @notice Provides read-only functions to inspect the state of a Diamond proxy, including facets, function selectors, and supported interfaces

src/interfaces/IDiamondCut.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {FacetCut} from "@diamond/libraries/types/DiamondTypes.sol";
+import {FacetCut} from "@diamond/libraries/types/DiamondStorage.sol";
 
 interface IDiamondCut {
     /// @notice Add/replace/remove any number of functions and optionally execute

src/interfaces/IDiamondLoupe.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {Facet} from "@diamond/libraries/types/DiamondTypes.sol";
+import {Facet} from "@diamond/libraries/types/DiamondStorage.sol";
 
 interface IDiamondLoupe {
     /// @notice Gets all facet addresses and their function selectors.

src/libraries/LibDiamond.sol

@@ -5,8 +5,8 @@ import {
     FacetCut,
     FacetCutAction,
     DiamondStorage,
-    DIAMOND_STORAGE_LOCATION
-} from "@diamond/libraries/types/DiamondTypes.sol";
+    DIAMOND_STORAGE_SLOT
+} from "@diamond/libraries/types/DiamondStorage.sol";
 import "@diamond/libraries/logs/DiamondLogs.sol";
 import "@diamond/libraries/errors/DiamondErrors.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
@@ -26,9 +26,8 @@ library LibDiamond {
 
     /// @dev Get the diamond storage.
     function _diamondStorage() internal pure returns (DiamondStorage storage ds_) {
-        bytes32 position = DIAMOND_STORAGE_LOCATION;
         assembly {
-            ds_.slot := position
+            ds_.slot := DIAMOND_STORAGE_SLOT
         }
     }
 

src/libraries/logs/DiamondLogs.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {FacetCut} from "@diamond/libraries/types/DiamondTypes.sol";
+import {FacetCut} from "@diamond/libraries/types/DiamondStorage.sol";
 
 //*//////////////////////////////////////////////////////////////////////////
 //                             DIAMOND CUT EVENT

src/libraries/types/DiamondTypes.sol src/libraries/types/DiamondStorage.solsrc/libraries/types/DiamondTypes.sol renamed to src/libraries/types/DiamondStorage.sol

@@ -7,6 +7,9 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 //                           DIAMOND STORAGE TYPES
 //////////////////////////////////////////////////////////////////////////*//
 
+// keccak256(abi.encode(uint256(keccak256("diamond.standard.diamond.storage")) - 1)) & ~bytes32(uint256(0xff));
+bytes32 constant DIAMOND_STORAGE_SLOT = 0x44fefae66705534388ac21ba5f0775616856a675b8eaea9bb0b2507f06238700;
+
 /// @notice Storage structure for managing facets and interface support in a Diamond (EIP-2535) proxy
 /// @dev Tracks function selector mappings, facet lists, and ERC-165 interface support
 /// @custom:storage-location erc7201:diamond.standard.diamond.storage
@@ -21,9 +24,6 @@ struct DiamondStorage {
     mapping(bytes4 => bool) supportedInterfaces;
 }
 
-// keccak256(abi.encode(uint256(keccak256("diamond.standard.diamond.storage")) - 1)) & ~bytes32(uint256(0xff));
-bytes32 constant DIAMOND_STORAGE_LOCATION = 0x44fefae66705534388ac21ba5f0775616856a675b8eaea9bb0b2507f06238700;
-
 //*//////////////////////////////////////////////////////////////////////////
 //                             DIAMOND CUT TYPES
 //////////////////////////////////////////////////////////////////////////*//

test/DiamondTester.t.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.4;
 
 import {Test} from "forge-std/Test.sol";
-import {Facet} from "@diamond/libraries/types/DiamondTypes.sol";
+import {Facet} from "@diamond/libraries/types/DiamondStorage.sol";
 import {DeployedDiamondState} from "./helpers/TestStates.sol";
 
 /// @title DiamondTester