|
1 | 1 | // SPDX-License-Identifier: MIT
|
2 | 2 | pragma solidity ^0.8.4;
|
3 | 3 |
|
4 |
| -import {Test, console} from "forge-std/Test.sol"; |
| 4 | +import {Test} from "forge-std/Test.sol"; |
5 | 5 | import {DeployDiamond} from "@diamond-script/DeployDiamond.s.sol";
|
6 | 6 | import {DeployDiamondHelper} from "@diamond-test/helpers/DeployDiamondHelper.sol";
|
7 | 7 | import {Diamond} from "@diamond/Diamond.sol";
|
8 | 8 | import {IDiamondCut} from "@diamond/interfaces/IDiamondCut.sol";
|
9 | 9 | import {IDiamondLoupe} from "@diamond/interfaces/IDiamondLoupe.sol";
|
10 |
| -import {HelperContract} from "@diamond-test/helpers/HelperContract.sol"; |
11 |
| -import {MyShinyFacet} from "@diamond/facets/MyShinyFacet.sol"; |
12 |
| -import {AddMyShinyFacet} from "@diamond-script/AddMyShinyFacet.s.sol"; |
13 |
| -import {AddMyShinyFacetHelper} from "@diamond-test/helpers/AddMyShinyFacetHelper.sol"; |
14 | 10 |
|
15 | 11 | /// @notice Provides shared state for tests involving a freshly deployed Diamond contract.
|
16 | 12 | /// @dev Sets up references to deployed facets, interfaces, and the diamond itself for testing.
|
@@ -41,35 +37,3 @@ abstract contract DeployedDiamondState is DeployDiamondHelper {
|
41 | 37 | facetAddresses = diamondLoupe.facetAddresses();
|
42 | 38 | }
|
43 | 39 | }
|
44 |
| - |
45 |
| -abstract contract AddMyShinyFacetState is DeployDiamondHelper, AddMyShinyFacetHelper { |
46 |
| - /// @notice Instance of the deployed Diamond contract. |
47 |
| - Diamond public diamond; |
48 |
| - |
49 |
| - /// @notice Interface for the DiamondCut functionality of the deployed diamond. |
50 |
| - IDiamondCut public diamondCut; |
51 |
| - |
52 |
| - /// @notice Interface for the DiamondLoupe functionality of the deployed diamond. |
53 |
| - IDiamondLoupe public diamondLoupe; |
54 |
| - |
55 |
| - /// @notice Stores the facet addresses returned from the diamond loupe. |
56 |
| - address[] public facetAddresses; |
57 |
| - |
58 |
| - MyShinyFacet public myShinyFacet; |
59 |
| - |
60 |
| - AddMyShinyFacet public addMyShinyFacet; |
61 |
| - |
62 |
| - string[4] public facetNames = ["DiamondCutFacet", "DiamondLoupeFacet", "OwnableRolesFacet", "MyShinyFacet"]; |
63 |
| - |
64 |
| - function setUp() public { |
65 |
| - vm.startPrank(diamondOwner); |
66 |
| - diamond = _deployDiamond(diamondOwner); |
67 |
| - |
68 |
| - diamondCut = IDiamondCut(address(diamond)); |
69 |
| - diamondLoupe = IDiamondLoupe(address(diamond)); |
70 |
| - |
71 |
| - myShinyFacet = _addMyShinyFacet(diamond); |
72 |
| - |
73 |
| - facetAddresses = diamondLoupe.facetAddresses(); |
74 |
| - } |
75 |
| -} |
0 commit comments