fix: remove Components.sol (#255)

* fix: remove `Components.sol`

* fix: put constants back

Author: ZeroEkkusu

src/Common.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2 <0.9.0;
 
-import {StdStorage, Vm} from "./Components.sol";
+import {StdStorage} from "./StdStorage.sol";
+import {Vm} from "./Vm.sol";
 
 abstract contract CommonBase {
     // Cheat code address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
@@ -16,9 +17,6 @@ abstract contract CommonBase {
     // Address of the test contract, deployed by the DEFAULT_SENDER.
     address internal constant DEFAULT_TEST_CONTRACT = 0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f;
 
-    // Create2 factory used by scripts when deploying with create2, https://github.com/Arachnid/deterministic-deployment-proxy.
-    address internal constant CREATE2_FACTORY = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
-
     uint256 internal constant UINT256_MAX =
         115792089237316195423570985008687907853269984665640564039457584007913129639935;
 

src/Components.sol

@@ -2,10 +2,20 @@
 pragma solidity >=0.6.2 <0.9.0;
 
 import {CommonBase} from "./Common.sol";
-// forgefmt: disable-next-line
-import {console, console2, StdChains, StdCheatsSafe, stdJson, stdMath, StdStorage, stdStorageSafe, StdUtils, VmSafe} from "./Components.sol";
+import {console} from "./console.sol";
+import {console2} from "./console2.sol";
+import {StdChains} from "./StdChains.sol";
+import {StdCheatsSafe} from "./StdCheats.sol";
+import {stdJson} from "./StdJson.sol";
+import {stdMath} from "./StdMath.sol";
+import {StdStorage, stdStorageSafe} from "./StdStorage.sol";
+import {StdUtils} from "./StdUtils.sol";
+import {VmSafe} from "./Vm.sol";
 
 abstract contract ScriptBase is CommonBase {
+    // Create2 factory used by scripts when deploying with create2, https://github.com/Arachnid/deterministic-deployment-proxy.
+    address internal constant CREATE2_FACTORY = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
+
     VmSafe internal constant vmSafe = VmSafe(VM_ADDRESS);
 }
 

src/Script.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2 <0.9.0;
 
-import "ds-test/test.sol";
-import "./StdMath.sol";
+import {DSTest} from "ds-test/test.sol";
+import {stdMath} from "./StdMath.sol";
 
 abstract contract StdAssertions is DSTest {
     event log_array(uint256[] val);

src/StdAssertions.sol

@@ -3,8 +3,8 @@ pragma solidity >=0.6.2 <0.9.0;
 
 pragma experimental ABIEncoderV2;
 
-import "./StdStorage.sol";
-import "./Vm.sol";
+import {StdStorage, stdStorage} from "./StdStorage.sol";
+import {Vm, VmSafe} from "./Vm.sol";
 
 abstract contract StdCheatsSafe {
     VmSafe private constant vm = VmSafe(address(uint160(uint256(keccak256("hevm cheat code")))));

src/StdCheats.sol

@@ -3,7 +3,7 @@ pragma solidity >=0.6.0 <0.9.0;
 
 pragma experimental ABIEncoderV2;
 
-import "./Vm.sol";
+import {VmSafe} from "./Vm.sol";
 
 // Helpers for parsing and writing JSON files
 // To parse:
@@ -27,7 +27,7 @@ import "./Vm.sol";
 // ```
 
 library stdJson {
-    VmSafe private constant vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
+    VmSafe private constant vm = VmSafe(address(uint160(uint256(keccak256("hevm cheat code")))));
 
     function parseRaw(string memory json, string memory key) internal pure returns (bytes memory) {
         return vm.parseJson(json, key);

src/StdJson.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2 <0.9.0;
 
-import "./Vm.sol";
+import {Vm} from "./Vm.sol";
 
 struct StdStorage {
     mapping(address => mapping(bytes4 => mapping(bytes32 => uint256))) slots;

src/StdStorage.sol

@@ -2,9 +2,18 @@
 pragma solidity >=0.6.2 <0.9.0;
 
 import {CommonBase} from "./Common.sol";
-import "ds-test/test.sol";
-// forgefmt: disable-next-line
-import {console, console2, StdAssertions, StdChains, StdCheats, stdError, stdJson, stdMath, StdStorage, stdStorage, StdUtils, Vm} from "./Components.sol";
+import {DSTest} from "ds-test/test.sol";
+import {console} from "./console.sol";
+import {console2} from "./console2.sol";
+import {StdAssertions} from "./StdAssertions.sol";
+import {StdChains} from "./StdChains.sol";
+import {StdCheats} from "./StdCheats.sol";
+import {stdError} from "./StdError.sol";
+import {stdJson} from "./StdJson.sol";
+import {stdMath} from "./StdMath.sol";
+import {StdStorage, stdStorage} from "./StdStorage.sol";
+import {StdUtils} from "./StdUtils.sol";
+import {Vm} from "./Vm.sol";
 
 abstract contract TestBase is CommonBase {}