Attempt to fix failing CI

Author: EmilFattakhov

.DS_Store

@@ -0,0 +1,4 @@
+[submodule "smart_contract/lib/forge-std"]
+	path = smart_contract/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std.git
+

.gitmodules

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "foundry-test-utility": "^0.1.1"
+  }
+}

discord-bot/.DS_Store

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
  * @title Faucet - Test
  */
 
-import { CheatCodes } from 'foundry-test-utility/contracts/utils/cheatcodes.sol';
+// forge-std provides Vm via Test base; explicit CheatCodes import not needed
 import { Constants } from "./utils/constants.t.sol";
 
 import { Faucet } from "../Faucet.sol";
@@ -21,6 +21,10 @@ contract FaucetTest is Constants {
 
         faucet.addMinter(address(this));
 
+        // Align contract config with test constants
+        faucet.setWithdrawalAmount(BASIC_MINT_AMOUNT);
+        faucet.setLockTime(BASIC_TIME_LOCK);
+
         vm.deal(address(faucet), BASIC_MINT_AMOUNT);
 
         vm.stopPrank();

package-lock.json

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import 'foundry-test-utility/contracts/utils/console.sol';
+import 'forge-std/console.sol';
 import { Errors } from './errors.t.sol';
 
 contract Constants is Errors {

package.json

@@ -1,18 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { stdJson } from 'foundry-test-utility/contracts/utils/stdJson.sol';
-import { Vm } from 'foundry-test-utility/contracts/utils/vm.sol';
-import { DSTest } from 'foundry-test-utility/contracts/utils/test.sol';
+import { stdJson } from 'forge-std/StdJson.sol';
+import { Test } from 'forge-std/Test.sol';
 
-contract Errors is DSTest {
+contract Errors is Test {
   using stdJson for string;
 
-  Vm public constant vm = Vm(address(uint160(uint256(keccak256('hevm cheat code')))));
-
   mapping(RevertStatus => string) private _errors;
 
-  // Add a revert error to the enum of errors.
   enum RevertStatus {
     SUCCESS,
     SKIP_VALIDATION,
@@ -25,7 +21,10 @@ contract Errors is DSTest {
 
   // Associate your error with a revert message and add it to the mapping.
   constructor() {
-    string memory json = vm.readFile('./constants/errors.json');
+    // Resolve path from the Foundry project root to avoid CI working-directory issues
+    string memory root = vm.projectRoot();
+    string memory path = string.concat(root, '/constants/errors.json');
+    string memory json = vm.readFile(path);
 
     // Faucet
     _errors[RevertStatus.Faucet_FailSendingNativeToken] = json.readString('.Faucet.FailSendingNativeToken');