From 3911cc5d0a982ac37fe9eae52fb4d8b6c1b963fd Mon Sep 17 00:00:00 2001 From: adjoly Date: Thu, 7 Aug 2025 19:21:54 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=99=BB=EF=B8=8F=E3=80=8D=20refactor?= =?UTF-8?q?:=20moved=20lib=20to=20code/=20folder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 4 ++-- Justfile | 3 +++ code/Kanel42_token.sol | 3 --- code/lib/forge-std | 1 + code/test/Kanel42_token.t.sol | 4 ++-- foundry.toml | 2 +- lib/forge-std | 1 - 7 files changed, 9 insertions(+), 9 deletions(-) create mode 160000 code/lib/forge-std delete mode 160000 lib/forge-std diff --git a/.gitmodules b/.gitmodules index 888d42d..755f7c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "lib/forge-std"] - path = lib/forge-std +[submodule "code/lib/forge-std"] + path = code/lib/forge-std url = https://github.com/foundry-rs/forge-std diff --git a/Justfile b/Justfile index 7e8ab67..aefe057 100644 --- a/Justfile +++ b/Justfile @@ -1,3 +1,6 @@ # The default one (the one you are seeing right now) @default: just -l + +@test: + forge test diff --git a/code/Kanel42_token.sol b/code/Kanel42_token.sol index f09fefa..6ee16ff 100644 --- a/code/Kanel42_token.sol +++ b/code/Kanel42_token.sol @@ -2,9 +2,6 @@ pragma solidity 0.8.28; -import "../../lib/forge-std/src/Test.sol"; -import { console } from "../lib/forge-std/src/console.sol"; - contract Kanel42_token { string public name = "Kanel42"; string public symbol = "KNL42"; diff --git a/code/lib/forge-std b/code/lib/forge-std new file mode 160000 index 0000000..8bbcf6e --- /dev/null +++ b/code/lib/forge-std @@ -0,0 +1 @@ +Subproject commit 8bbcf6e3f8f62f419e5429a0bd89331c85c37824 diff --git a/code/test/Kanel42_token.t.sol b/code/test/Kanel42_token.t.sol index 697068b..7746969 100644 --- a/code/test/Kanel42_token.t.sol +++ b/code/test/Kanel42_token.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.28; -import "../../lib/forge-std/src/Test.sol"; -import { console } from "../../lib/forge-std/src/console.sol"; +import "../lib/forge-std/src/Test.sol"; +import { console } from "../lib/forge-std/src/console.sol"; import "../Kanel42_token.sol"; contract Kanel42TokenTest is Test { diff --git a/foundry.toml b/foundry.toml index 2baf1e3..ac4b60a 100644 --- a/foundry.toml +++ b/foundry.toml @@ -2,7 +2,7 @@ src = "code" out = "out" test = "code/test" -libs = ["node_modules", "lib"] +libs = ["node_modules", "code/lib"] solc = '0.8.28' # Enable or disable the optimizer optimizer = true diff --git a/lib/forge-std b/lib/forge-std deleted file mode 160000 index c7be2a3..0000000 --- a/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c7be2a3481f9e51230880bb0949072c7e3a4da82