diff --git a/.github/workflows/ci-deep.yml b/.github/workflows/ci-deep.yml index 4a6139474..57e3be580 100644 --- a/.github/workflows/ci-deep.yml +++ b/.github/workflows/ci-deep.yml @@ -42,7 +42,7 @@ jobs: with: foundry-fuzz-runs: ${{ fromJSON(inputs.unitFuzzRuns || '50000') }} foundry-profile: "test-optimized" - match-path: "test/unit/**/*.sol" + match-path: "tests/unit/**/*.sol" name: "Unit tests" test-integration: @@ -51,7 +51,7 @@ jobs: with: foundry-fuzz-runs: ${{ fromJSON(inputs.integrationFuzzRuns || '50000') }} foundry-profile: "test-optimized" - match-path: "test/integration/**/*.sol" + match-path: "tests/integration/**/*.sol" name: "Integration tests" test-invariant: @@ -61,7 +61,7 @@ jobs: foundry-invariant-depth: ${{ fromJSON(inputs.invariantDepth || '100') }} foundry-invariant-runs: ${{ fromJSON(inputs.invariantRuns || '100') }} foundry-profile: "test-optimized" - match-path: "test/invariant/**/*.sol" + match-path: "tests/invariant/**/*.sol" name: "Invariant tests" test-fork: @@ -72,7 +72,7 @@ jobs: with: foundry-fuzz-runs: ${{ fromJSON(inputs.forkFuzzRuns || '1000') }} foundry-profile: "test-optimized" - match-path: "test/fork/**/*.sol" + match-path: "tests/fork/**/*.sol" name: "Fork tests" notify-on-failure: diff --git a/.github/workflows/ci-fork.yml b/.github/workflows/ci-fork.yml index 20b3cec63..969da8fd0 100644 --- a/.github/workflows/ci-fork.yml +++ b/.github/workflows/ci-fork.yml @@ -20,7 +20,7 @@ jobs: foundry-fuzz-runs: 100 foundry-profile: "test-optimized" fuzz-seed: true - match-path: "test/fork/**/*.sol" + match-path: "tests/fork/**/*.sol" name: "Fork tests" test-utils: @@ -28,7 +28,7 @@ jobs: uses: "sablier-labs/reusable-workflows/.github/workflows/forge-test.yml@main" with: foundry-profile: "test-optimized" - match-path: "test/utils/**/*.sol" + match-path: "tests/utils/**/*.sol" name: "Utils tests" notify-on-failure: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea16fcb8a..73e38dc99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: uses: "sablier-labs/reusable-workflows/.github/workflows/bulloak-check.yml@main" with: skip-modifiers: true - tree-path: "test" + tree-path: "tests" build: uses: "sablier-labs/reusable-workflows/.github/workflows/forge-build.yml@main" @@ -33,7 +33,7 @@ jobs: with: foundry-fuzz-runs: 2000 foundry-profile: "test-optimized" - match-path: "test/unit/**/*.sol" + match-path: "tests/unit/**/*.sol" name: "Unit tests" test-integration: @@ -42,7 +42,7 @@ jobs: with: foundry-fuzz-runs: 2000 foundry-profile: "test-optimized" - match-path: "test/integration/**/*.sol" + match-path: "tests/integration/**/*.sol" name: "Integration tests" test-invariant: @@ -50,7 +50,7 @@ jobs: uses: "sablier-labs/reusable-workflows/.github/workflows/forge-test.yml@main" with: foundry-profile: "test-optimized" - match-path: "test/invariant/**/*.sol" + match-path: "tests/invariant/**/*.sol" name: "Invariant tests" test-fork: @@ -61,7 +61,7 @@ jobs: with: foundry-fuzz-runs: 20 foundry-profile: "test-optimized" - match-path: "test/fork/**/*.sol" + match-path: "tests/fork/**/*.sol" name: "Fork tests" coverage: @@ -70,4 +70,4 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} uses: "sablier-labs/reusable-workflows/.github/workflows/forge-coverage.yml@main" with: - match-path: "test/{integration,unit}/**/*.sol" + match-path: "tests/{integration,unit}/**/*.sol" diff --git a/.lintstagedrc.yml b/.lintstagedrc.yml index 2353f3772..89728bbd3 100644 --- a/.lintstagedrc.yml +++ b/.lintstagedrc.yml @@ -1,4 +1,4 @@ "*.{json,md,svg,yml}": "prettier --write" "*.sol": - - "bun solhint {benchmark,precompiles,script,src,test}/**/*.sol --fix --noPrompt" + - "bun solhint {benchmark,precompiles,script,src,tests}/**/*.sol --fix --noPrompt" - "forge fmt" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 24ae273d7..273e8ab32 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,7 +53,10 @@ When making a pull request, ensure that: - The base branch is `staging`. - All tests pass. - - Fork testing requires environment variables to be set up in the forked repo. +- Concrete tests are generated using Bulloak and the Branching Tree Technique (BTT). + - You can learn more about this on the [Bulloak website](https://bulloak.dev). + - If you modify a test tree, use this command to generate the corresponding test contract that complies with BTT: + `bulloak scaffold -wf /path/to/file.tree` - Code coverage remains the same or greater. - All new code adheres to the style guide: - All lint checks pass. diff --git a/README.md b/README.md index 549c0b323..09a5f30b6 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ docs, as well as these [diagrams](https://docs.sablier.com/contracts/v2/referenc ### Branching Tree Technique You may notice that some test files are accompanied by `.tree` files. This is called the Branching Tree Technique, and -it is explained in depth [here](https://github.com/sablier-labs/lockup/wiki/Tests#branching-tree-technique). +it is explained in depth [here](https://www.bulloak.dev/). ## Deployments @@ -124,6 +124,6 @@ The primary license for Sablier Lockup is the Business Source License 1.1 (`BUSL - All files in `src/interfaces/` and `src/types` are licensed under `GPL-3.0-or-later`, see [`LICENSE-GPL.md`](./LICENSE-GPL.md). -- Several files in `src`, `script`, and `test` are licensed under `GPL-3.0-or-later`, see +- Several files in `src`, `script`, and `tests` are licensed under `GPL-3.0-or-later`, see [`LICENSE-GPL.md`](./LICENSE-GPL.md). -- Many files in `test/` remain unlicensed (as indicated in their SPDX headers). +- Many files in `tests/` remain unlicensed (as indicated in their SPDX headers). diff --git a/SECURITY.md b/SECURITY.md index 48068daa9..411bc3d6c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -21,7 +21,7 @@ The scope of the Program is limited to bugs that result in the draining of funds The Program does NOT cover the following: -- Code located in the [test](./test) or [script](./script) directories. +- Code located in the [tests](./tests) or [script](./script) directories. - External code in `node_modules`, except for code that is explicitly used by a deployed contract located in the [src](./src) directory. - Contract deployments on test networks, such as Sepolia. diff --git a/benchmark/BatchLockup.Gas.t.sol b/benchmark/BatchLockup.Gas.t.sol index 1d3621b89..df8ca44b9 100644 --- a/benchmark/BatchLockup.Gas.t.sol +++ b/benchmark/BatchLockup.Gas.t.sol @@ -3,9 +3,9 @@ pragma solidity >=0.8.22; import { ud2x18 } from "@prb/math/src/UD2x18.sol"; -import { Lockup, LockupDynamic, LockupTranched } from "../src//types/DataTypes.sol"; -import { BatchLockup } from "../src//types/DataTypes.sol"; -import { BatchLockupBuilder } from "../test/utils/BatchLockupBuilder.sol"; +import { Lockup, LockupDynamic, LockupTranched } from "../src/types/DataTypes.sol"; +import { BatchLockup } from "../src/types/DataTypes.sol"; +import { BatchLockupBuilder } from "../tests/utils/BatchLockupBuilder.sol"; import { Benchmark_Test } from "./Benchmark.t.sol"; diff --git a/benchmark/Benchmark.t.sol b/benchmark/Benchmark.t.sol index 0c17e7f9f..c908852ed 100644 --- a/benchmark/Benchmark.t.sol +++ b/benchmark/Benchmark.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.22; import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; -import { Base_Test } from "../test/Base.t.sol"; +import { Base_Test } from "../tests/Base.t.sol"; /// @notice Benchmark contract with common logic needed by all tests. abstract contract Benchmark_Test is Base_Test { diff --git a/benchmark/LockupDynamic.Gas.t.sol b/benchmark/LockupDynamic.Gas.t.sol index 49b832ef7..2d22f290a 100644 --- a/benchmark/LockupDynamic.Gas.t.sol +++ b/benchmark/LockupDynamic.Gas.t.sol @@ -4,7 +4,7 @@ pragma solidity >=0.8.22; import { ud2x18 } from "@prb/math/src/UD2x18.sol"; import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; -import { Lockup, LockupDynamic } from "../src//types/DataTypes.sol"; +import { Lockup, LockupDynamic } from "../src/types/DataTypes.sol"; import { Benchmark_Test } from "./Benchmark.t.sol"; diff --git a/benchmark/LockupLinear.Gas.t.sol b/benchmark/LockupLinear.Gas.t.sol index 08639e35b..4cd5c19f1 100644 --- a/benchmark/LockupLinear.Gas.t.sol +++ b/benchmark/LockupLinear.Gas.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.22; import { ud } from "@prb/math/src/UD60x18.sol"; -import { Lockup, LockupLinear } from "../src//types/DataTypes.sol"; +import { Lockup, LockupLinear } from "../src/types/DataTypes.sol"; import { Benchmark_Test } from "./Benchmark.t.sol"; diff --git a/benchmark/LockupTranched.Gas.t.sol b/benchmark/LockupTranched.Gas.t.sol index 06675fb16..faf8cd468 100644 --- a/benchmark/LockupTranched.Gas.t.sol +++ b/benchmark/LockupTranched.Gas.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.22; import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; -import { Lockup, LockupTranched } from "../src//types/DataTypes.sol"; +import { Lockup, LockupTranched } from "../src/types/DataTypes.sol"; import { Benchmark_Test } from "./Benchmark.t.sol"; diff --git a/codecov.yml b/codecov.yml index 1ab56482e..7c149e7e5 100644 --- a/codecov.yml +++ b/codecov.yml @@ -9,4 +9,4 @@ ignore: - "script" - "src/libraries/NFTSVG.sol" - "src/libraries/SVGElements.sol" - - "test" + - "tests" diff --git a/foundry.toml b/foundry.toml index 3aade3789..a860a1356 100644 --- a/foundry.toml +++ b/foundry.toml @@ -16,7 +16,7 @@ sender = "0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38" solc = "0.8.26" src = "src" - test = "test" + test = "tests" [profile.default.fuzz] max_test_rejects = 1_000_000 # Number of times `vm.assume` can fail @@ -45,7 +45,7 @@ "src/libraries/VestingMath.sol:VestingMath:0x26F9d826BDed47Fc472526aE8095B75ac336963C" ] out = "out-optimized" - test = "test/mocks" + test = "tests/mocks" via_ir = true @@ -81,7 +81,7 @@ # Test the optimized contracts without re-compiling them [profile.test-optimized] - src = "test" + src = "tests" [doc] ignore = ["**/*.t.sol"] diff --git a/package.json b/package.json index 4a1ce9656..8f2661ac2 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "artifacts", "precompiles", "src", - "test/utils", + "tests/utils", "CHANGELOG.md", "LICENSE-GPL.md" ], @@ -69,8 +69,8 @@ "clean": "rm -rf artifacts broadcast cache docs out out-optimized out-svg", "lint": "bun run lint:sol && bun run prettier:check", "lint:fix": "bun run lint:sol:fix && forge fmt", - "lint:sol": "forge fmt --check && bun solhint \"{benchmark,precompiles,script,src,test}/**/*.sol\"", - "lint:sol:fix": "bun solhint \"{benchmark,precompiles,script,src,test}/**/*.sol\" --fix --noPrompt", + "lint:sol": "forge fmt --check && bun solhint \"{benchmark,precompiles,script,src,tests}/**/*.sol\"", + "lint:sol:fix": "bun solhint \"{benchmark,precompiles,script,src,tests}/**/*.sol\" --fix --noPrompt", "prepack": "bun install && bash ./shell/prepare-artifacts.sh", "prepare": "husky", "prettier:check": "prettier --check \"**/*.{json,md,svg,yml}\"", diff --git a/slither.config.json b/slither.config.json index a42619ece..b4aff4043 100644 --- a/slither.config.json +++ b/slither.config.json @@ -1,6 +1,6 @@ { "detectors_to_exclude": "naming-convention,reentrancy-events,solc-version,timestamp", - "filter_paths": "(node_modules/,test/)", + "filter_paths": "(node_modules/,tests/)", "solc_remaps": [ "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/", "@prb/math/=node_modules/@prb-math/", diff --git a/test/Base.t.sol b/tests/Base.t.sol similarity index 100% rename from test/Base.t.sol rename to tests/Base.t.sol diff --git a/test/fork/Fork.t.sol b/tests/fork/Fork.t.sol similarity index 100% rename from test/fork/Fork.t.sol rename to tests/fork/Fork.t.sol diff --git a/test/fork/LockupDynamic.t.sol b/tests/fork/LockupDynamic.t.sol similarity index 100% rename from test/fork/LockupDynamic.t.sol rename to tests/fork/LockupDynamic.t.sol diff --git a/test/fork/LockupLinear.t.sol b/tests/fork/LockupLinear.t.sol similarity index 100% rename from test/fork/LockupLinear.t.sol rename to tests/fork/LockupLinear.t.sol diff --git a/test/fork/LockupTranched.t.sol b/tests/fork/LockupTranched.t.sol similarity index 100% rename from test/fork/LockupTranched.t.sol rename to tests/fork/LockupTranched.t.sol diff --git a/test/fork/NFTDescriptor.t.sol b/tests/fork/NFTDescriptor.t.sol similarity index 100% rename from test/fork/NFTDescriptor.t.sol rename to tests/fork/NFTDescriptor.t.sol diff --git a/test/fork/assets/DAI.t.sol b/tests/fork/assets/DAI.t.sol similarity index 100% rename from test/fork/assets/DAI.t.sol rename to tests/fork/assets/DAI.t.sol diff --git a/test/fork/assets/EURS.t.sol b/tests/fork/assets/EURS.t.sol similarity index 100% rename from test/fork/assets/EURS.t.sol rename to tests/fork/assets/EURS.t.sol diff --git a/test/fork/assets/SHIB.t.sol b/tests/fork/assets/SHIB.t.sol similarity index 100% rename from test/fork/assets/SHIB.t.sol rename to tests/fork/assets/SHIB.t.sol diff --git a/test/fork/assets/USDC.t.sol b/tests/fork/assets/USDC.t.sol similarity index 100% rename from test/fork/assets/USDC.t.sol rename to tests/fork/assets/USDC.t.sol diff --git a/test/fork/assets/USDT.t.sol b/tests/fork/assets/USDT.t.sol similarity index 100% rename from test/fork/assets/USDT.t.sol rename to tests/fork/assets/USDT.t.sol diff --git a/test/integration/Integration.t.sol b/tests/integration/Integration.t.sol similarity index 100% rename from test/integration/Integration.t.sol rename to tests/integration/Integration.t.sol diff --git a/test/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.t.sol b/tests/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.t.sol similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.t.sol rename to tests/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.t.sol diff --git a/test/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.tree b/tests/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.tree similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.tree rename to tests/integration/concrete/batch-lockup/create-with-durations-ld/createWithDurationsLD.tree diff --git a/test/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.t.sol b/tests/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.t.sol similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.t.sol rename to tests/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.t.sol diff --git a/test/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.tree b/tests/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.tree similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.tree rename to tests/integration/concrete/batch-lockup/create-with-durations-ll/createWithDurationsLL.tree diff --git a/test/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.t.sol b/tests/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.t.sol similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.t.sol rename to tests/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.t.sol diff --git a/test/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.tree b/tests/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.tree similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.tree rename to tests/integration/concrete/batch-lockup/create-with-durations-lt/createWithDurationsLT.tree diff --git a/test/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.t.sol b/tests/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.t.sol similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.t.sol rename to tests/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.t.sol diff --git a/test/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.tree b/tests/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.tree similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.tree rename to tests/integration/concrete/batch-lockup/create-with-timestamps-ld/createWithTimestampsLD.tree diff --git a/test/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.t.sol b/tests/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.t.sol similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.t.sol rename to tests/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.t.sol diff --git a/test/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.tree b/tests/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.tree similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.tree rename to tests/integration/concrete/batch-lockup/create-with-timestamps-ll/createWithTimestamps.tree diff --git a/test/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.t.sol b/tests/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.t.sol similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.t.sol rename to tests/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.t.sol diff --git a/test/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.tree b/tests/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.tree similarity index 100% rename from test/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.tree rename to tests/integration/concrete/batch-lockup/create-with-timestamps-lt/createWithTimestampsLT.tree diff --git a/test/integration/concrete/constructor.t.sol b/tests/integration/concrete/constructor.t.sol similarity index 100% rename from test/integration/concrete/constructor.t.sol rename to tests/integration/concrete/constructor.t.sol diff --git a/test/integration/concrete/lockup-base/allow-to-hook/allowToHook.t.sol b/tests/integration/concrete/lockup-base/allow-to-hook/allowToHook.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/allow-to-hook/allowToHook.t.sol rename to tests/integration/concrete/lockup-base/allow-to-hook/allowToHook.t.sol diff --git a/test/integration/concrete/lockup-base/allow-to-hook/allowToHook.tree b/tests/integration/concrete/lockup-base/allow-to-hook/allowToHook.tree similarity index 100% rename from test/integration/concrete/lockup-base/allow-to-hook/allowToHook.tree rename to tests/integration/concrete/lockup-base/allow-to-hook/allowToHook.tree diff --git a/test/integration/concrete/lockup-base/batch/batch.t.sol b/tests/integration/concrete/lockup-base/batch/batch.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/batch/batch.t.sol rename to tests/integration/concrete/lockup-base/batch/batch.t.sol diff --git a/test/integration/concrete/lockup-base/batch/batch.tree b/tests/integration/concrete/lockup-base/batch/batch.tree similarity index 100% rename from test/integration/concrete/lockup-base/batch/batch.tree rename to tests/integration/concrete/lockup-base/batch/batch.tree diff --git a/test/integration/concrete/lockup-base/burn/burn.t.sol b/tests/integration/concrete/lockup-base/burn/burn.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/burn/burn.t.sol rename to tests/integration/concrete/lockup-base/burn/burn.t.sol diff --git a/test/integration/concrete/lockup-base/burn/burn.tree b/tests/integration/concrete/lockup-base/burn/burn.tree similarity index 100% rename from test/integration/concrete/lockup-base/burn/burn.tree rename to tests/integration/concrete/lockup-base/burn/burn.tree diff --git a/test/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.t.sol b/tests/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.t.sol rename to tests/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.t.sol diff --git a/test/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.tree b/tests/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.tree similarity index 100% rename from test/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.tree rename to tests/integration/concrete/lockup-base/cancel-multiple/cancelMultiple.tree diff --git a/test/integration/concrete/lockup-base/cancel/cancel.t.sol b/tests/integration/concrete/lockup-base/cancel/cancel.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/cancel/cancel.t.sol rename to tests/integration/concrete/lockup-base/cancel/cancel.t.sol diff --git a/test/integration/concrete/lockup-base/cancel/cancel.tree b/tests/integration/concrete/lockup-base/cancel/cancel.tree similarity index 100% rename from test/integration/concrete/lockup-base/cancel/cancel.tree rename to tests/integration/concrete/lockup-base/cancel/cancel.tree diff --git a/test/integration/concrete/lockup-base/collect-fees/collectFees.t.sol b/tests/integration/concrete/lockup-base/collect-fees/collectFees.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/collect-fees/collectFees.t.sol rename to tests/integration/concrete/lockup-base/collect-fees/collectFees.t.sol diff --git a/test/integration/concrete/lockup-base/collect-fees/collectFees.tree b/tests/integration/concrete/lockup-base/collect-fees/collectFees.tree similarity index 100% rename from test/integration/concrete/lockup-base/collect-fees/collectFees.tree rename to tests/integration/concrete/lockup-base/collect-fees/collectFees.tree diff --git a/test/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.t.sol b/tests/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.t.sol rename to tests/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.t.sol diff --git a/test/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.tree b/tests/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.tree similarity index 100% rename from test/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.tree rename to tests/integration/concrete/lockup-base/create-with-timestamps/createWithTimestamps.tree diff --git a/test/integration/concrete/lockup-base/getters/getters.t.sol b/tests/integration/concrete/lockup-base/getters/getters.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/getters/getters.t.sol rename to tests/integration/concrete/lockup-base/getters/getters.t.sol diff --git a/test/integration/concrete/lockup-base/getters/getters.tree b/tests/integration/concrete/lockup-base/getters/getters.tree similarity index 100% rename from test/integration/concrete/lockup-base/getters/getters.tree rename to tests/integration/concrete/lockup-base/getters/getters.tree diff --git a/test/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.t.sol b/tests/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.t.sol rename to tests/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.t.sol diff --git a/test/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.tree b/tests/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.tree rename to tests/integration/concrete/lockup-base/refundable-amount-of/refundableAmountOf.tree diff --git a/test/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.t.sol b/tests/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.t.sol rename to tests/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.t.sol diff --git a/test/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.tree b/tests/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.tree similarity index 100% rename from test/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.tree rename to tests/integration/concrete/lockup-base/renounce-multiple/renounceMultiple.tree diff --git a/test/integration/concrete/lockup-base/renounce/renounce.t.sol b/tests/integration/concrete/lockup-base/renounce/renounce.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/renounce/renounce.t.sol rename to tests/integration/concrete/lockup-base/renounce/renounce.t.sol diff --git a/test/integration/concrete/lockup-base/renounce/renounce.tree b/tests/integration/concrete/lockup-base/renounce/renounce.tree similarity index 100% rename from test/integration/concrete/lockup-base/renounce/renounce.tree rename to tests/integration/concrete/lockup-base/renounce/renounce.tree diff --git a/test/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.t.sol b/tests/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.t.sol rename to tests/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.t.sol diff --git a/test/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.tree b/tests/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.tree similarity index 100% rename from test/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.tree rename to tests/integration/concrete/lockup-base/set-nft-descriptor/setNFTDescriptor.tree diff --git a/test/integration/concrete/lockup-base/status-of/statusOf.t.sol b/tests/integration/concrete/lockup-base/status-of/statusOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/status-of/statusOf.t.sol rename to tests/integration/concrete/lockup-base/status-of/statusOf.t.sol diff --git a/test/integration/concrete/lockup-base/status-of/statusOf.tree b/tests/integration/concrete/lockup-base/status-of/statusOf.tree similarity index 100% rename from test/integration/concrete/lockup-base/status-of/statusOf.tree rename to tests/integration/concrete/lockup-base/status-of/statusOf.tree diff --git a/test/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.t.sol b/tests/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.t.sol rename to tests/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.t.sol diff --git a/test/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.tree b/tests/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.tree rename to tests/integration/concrete/lockup-base/streamed-amount-of/streamedAmountOf.tree diff --git a/test/integration/concrete/lockup-base/transfer-from/transferFrom.t.sol b/tests/integration/concrete/lockup-base/transfer-from/transferFrom.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/transfer-from/transferFrom.t.sol rename to tests/integration/concrete/lockup-base/transfer-from/transferFrom.t.sol diff --git a/test/integration/concrete/lockup-base/transfer-from/transferFrom.tree b/tests/integration/concrete/lockup-base/transfer-from/transferFrom.tree similarity index 100% rename from test/integration/concrete/lockup-base/transfer-from/transferFrom.tree rename to tests/integration/concrete/lockup-base/transfer-from/transferFrom.tree diff --git a/test/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.t.sol b/tests/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.t.sol rename to tests/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.t.sol diff --git a/test/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.tree b/tests/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.tree similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.tree rename to tests/integration/concrete/lockup-base/withdraw-hooks/withdrawHooks.tree diff --git a/test/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol b/tests/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol rename to tests/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol diff --git a/test/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree b/tests/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree rename to tests/integration/concrete/lockup-base/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree diff --git a/test/integration/concrete/lockup-base/withdraw-max/withdrawMax.t.sol b/tests/integration/concrete/lockup-base/withdraw-max/withdrawMax.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-max/withdrawMax.t.sol rename to tests/integration/concrete/lockup-base/withdraw-max/withdrawMax.t.sol diff --git a/test/integration/concrete/lockup-base/withdraw-max/withdrawMax.tree b/tests/integration/concrete/lockup-base/withdraw-max/withdrawMax.tree similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-max/withdrawMax.tree rename to tests/integration/concrete/lockup-base/withdraw-max/withdrawMax.tree diff --git a/test/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.t.sol b/tests/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.t.sol rename to tests/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.t.sol diff --git a/test/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.tree b/tests/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.tree similarity index 100% rename from test/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.tree rename to tests/integration/concrete/lockup-base/withdraw-multiple/withdrawMultiple.tree diff --git a/test/integration/concrete/lockup-base/withdraw/withdraw.t.sol b/tests/integration/concrete/lockup-base/withdraw/withdraw.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/withdraw/withdraw.t.sol rename to tests/integration/concrete/lockup-base/withdraw/withdraw.t.sol diff --git a/test/integration/concrete/lockup-base/withdraw/withdraw.tree b/tests/integration/concrete/lockup-base/withdraw/withdraw.tree similarity index 100% rename from test/integration/concrete/lockup-base/withdraw/withdraw.tree rename to tests/integration/concrete/lockup-base/withdraw/withdraw.tree diff --git a/test/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.t.sol b/tests/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.t.sol rename to tests/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.t.sol diff --git a/test/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.tree b/tests/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.tree rename to tests/integration/concrete/lockup-base/withdrawable-amount-of/withdrawableAmountOf.tree diff --git a/test/integration/concrete/lockup-dynamic/LockupDynamic.t.sol b/tests/integration/concrete/lockup-dynamic/LockupDynamic.t.sol similarity index 100% rename from test/integration/concrete/lockup-dynamic/LockupDynamic.t.sol rename to tests/integration/concrete/lockup-dynamic/LockupDynamic.t.sol diff --git a/test/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.t.sol b/tests/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.t.sol similarity index 100% rename from test/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.t.sol rename to tests/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.t.sol diff --git a/test/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.tree b/tests/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.tree similarity index 100% rename from test/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.tree rename to tests/integration/concrete/lockup-dynamic/create-with-durations-ld/createWithDurationsLD.tree diff --git a/test/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.t.sol b/tests/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.t.sol similarity index 100% rename from test/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.t.sol rename to tests/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.t.sol diff --git a/test/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.tree b/tests/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.tree similarity index 100% rename from test/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.tree rename to tests/integration/concrete/lockup-dynamic/create-with-timestamps-ld/createWithTimestampsLD.tree diff --git a/test/integration/concrete/lockup-dynamic/get-segments/getSegments.t.sol b/tests/integration/concrete/lockup-dynamic/get-segments/getSegments.t.sol similarity index 100% rename from test/integration/concrete/lockup-dynamic/get-segments/getSegments.t.sol rename to tests/integration/concrete/lockup-dynamic/get-segments/getSegments.t.sol diff --git a/test/integration/concrete/lockup-dynamic/get-segments/getSegments.tree b/tests/integration/concrete/lockup-dynamic/get-segments/getSegments.tree similarity index 100% rename from test/integration/concrete/lockup-dynamic/get-segments/getSegments.tree rename to tests/integration/concrete/lockup-dynamic/get-segments/getSegments.tree diff --git a/test/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol b/tests/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol rename to tests/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol diff --git a/test/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.tree b/tests/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.tree rename to tests/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.tree diff --git a/test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol b/tests/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol similarity index 99% rename from test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol rename to tests/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol index 895a3c5dc..e728e160b 100644 --- a/test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol +++ b/tests/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol @@ -7,7 +7,7 @@ import { console2 } from "forge-std/src/console2.sol"; import { StdStyle } from "forge-std/src/StdStyle.sol"; import { Base64 } from "solady/src/utils/Base64.sol"; -import { Integration_Test } from "test/integration/Integration.t.sol"; +import { Integration_Test } from "tests/integration/Integration.t.sol"; /// @dev Requirements for these tests to work: /// - The stream ID must be 1 diff --git a/test/integration/concrete/lockup-dynamic/token-uri/tokenURI.tree b/tests/integration/concrete/lockup-dynamic/token-uri/tokenURI.tree similarity index 100% rename from test/integration/concrete/lockup-dynamic/token-uri/tokenURI.tree rename to tests/integration/concrete/lockup-dynamic/token-uri/tokenURI.tree diff --git a/test/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol b/tests/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol rename to tests/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol diff --git a/test/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.tree b/tests/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.tree rename to tests/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.tree diff --git a/test/integration/concrete/lockup-linear/LockupLinear.t.sol b/tests/integration/concrete/lockup-linear/LockupLinear.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/LockupLinear.t.sol rename to tests/integration/concrete/lockup-linear/LockupLinear.t.sol diff --git a/test/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.t.sol b/tests/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.t.sol rename to tests/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.t.sol diff --git a/test/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.tree b/tests/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.tree similarity index 100% rename from test/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.tree rename to tests/integration/concrete/lockup-linear/create-with-durations-ll/createWithDurationsLL.tree diff --git a/test/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.t.sol b/tests/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.t.sol rename to tests/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.t.sol diff --git a/test/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.tree b/tests/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.tree similarity index 100% rename from test/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.tree rename to tests/integration/concrete/lockup-linear/create-with-timestamps-ll/createWithTimestampsLL.tree diff --git a/test/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.t.sol b/tests/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.t.sol rename to tests/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.t.sol diff --git a/test/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.tree b/tests/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.tree similarity index 100% rename from test/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.tree rename to tests/integration/concrete/lockup-linear/get-cliff-time/getCliffTime.tree diff --git a/test/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.t.sol b/tests/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.t.sol rename to tests/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.t.sol diff --git a/test/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.tree b/tests/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.tree similarity index 100% rename from test/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.tree rename to tests/integration/concrete/lockup-linear/get-unlock-amounts/getUnlockAmounts.tree diff --git a/test/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol b/tests/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol rename to tests/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol diff --git a/test/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.tree b/tests/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.tree rename to tests/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.tree diff --git a/test/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol b/tests/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol rename to tests/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol diff --git a/test/integration/concrete/lockup-linear/token-uri/tokenURI.tree b/tests/integration/concrete/lockup-linear/token-uri/tokenURI.tree similarity index 100% rename from test/integration/concrete/lockup-linear/token-uri/tokenURI.tree rename to tests/integration/concrete/lockup-linear/token-uri/tokenURI.tree diff --git a/test/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol b/tests/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol rename to tests/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol diff --git a/test/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.tree b/tests/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.tree rename to tests/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.tree diff --git a/test/integration/concrete/lockup-tranched/LockupTranched.t.sol b/tests/integration/concrete/lockup-tranched/LockupTranched.t.sol similarity index 100% rename from test/integration/concrete/lockup-tranched/LockupTranched.t.sol rename to tests/integration/concrete/lockup-tranched/LockupTranched.t.sol diff --git a/test/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.t.sol b/tests/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.t.sol similarity index 100% rename from test/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.t.sol rename to tests/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.t.sol diff --git a/test/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.tree b/tests/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.tree similarity index 100% rename from test/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.tree rename to tests/integration/concrete/lockup-tranched/create-with-durations-lt/createWithDurationsLT.tree diff --git a/test/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.t.sol b/tests/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.t.sol similarity index 100% rename from test/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.t.sol rename to tests/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.t.sol diff --git a/test/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.tree b/tests/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.tree similarity index 100% rename from test/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.tree rename to tests/integration/concrete/lockup-tranched/create-with-timestamps-lt/createWithTimestampsLT.tree diff --git a/test/integration/concrete/lockup-tranched/get-tranches/getTranches.t.sol b/tests/integration/concrete/lockup-tranched/get-tranches/getTranches.t.sol similarity index 100% rename from test/integration/concrete/lockup-tranched/get-tranches/getTranches.t.sol rename to tests/integration/concrete/lockup-tranched/get-tranches/getTranches.t.sol diff --git a/test/integration/concrete/lockup-tranched/get-tranches/getTranches.tree b/tests/integration/concrete/lockup-tranched/get-tranches/getTranches.tree similarity index 100% rename from test/integration/concrete/lockup-tranched/get-tranches/getTranches.tree rename to tests/integration/concrete/lockup-tranched/get-tranches/getTranches.tree diff --git a/test/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol b/tests/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol rename to tests/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol diff --git a/test/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.tree b/tests/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.tree rename to tests/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.tree diff --git a/test/integration/concrete/lockup-tranched/token-uri/tokenURI.t.sol b/tests/integration/concrete/lockup-tranched/token-uri/tokenURI.t.sol similarity index 100% rename from test/integration/concrete/lockup-tranched/token-uri/tokenURI.t.sol rename to tests/integration/concrete/lockup-tranched/token-uri/tokenURI.t.sol diff --git a/test/integration/concrete/lockup-tranched/token-uri/tokenURI.tree b/tests/integration/concrete/lockup-tranched/token-uri/tokenURI.tree similarity index 100% rename from test/integration/concrete/lockup-tranched/token-uri/tokenURI.tree rename to tests/integration/concrete/lockup-tranched/token-uri/tokenURI.tree diff --git a/test/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol b/tests/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol similarity index 100% rename from test/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol rename to tests/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol diff --git a/test/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.tree b/tests/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.tree similarity index 100% rename from test/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.tree rename to tests/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.tree diff --git a/test/integration/concrete/nft-descriptor/generateAccentColor.t.sol b/tests/integration/concrete/nft-descriptor/generateAccentColor.t.sol similarity index 93% rename from test/integration/concrete/nft-descriptor/generateAccentColor.t.sol rename to tests/integration/concrete/nft-descriptor/generateAccentColor.t.sol index 74797ff04..71d0b2152 100644 --- a/test/integration/concrete/nft-descriptor/generateAccentColor.t.sol +++ b/tests/integration/concrete/nft-descriptor/generateAccentColor.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract GenerateAccentColor_Integration_Concrete_Test is Base_Test { function test_GenerateAccentColor() external view { diff --git a/test/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.t.sol b/tests/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.t.sol similarity index 98% rename from test/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.t.sol rename to tests/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.t.sol index 6b2d6704c..16223f12a 100644 --- a/test/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.t.sol +++ b/tests/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract IsAllowedCharacter_Integration_Concrete_Test is Base_Test { function test_WhenEmptyString() external view { diff --git a/test/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.tree b/tests/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.tree similarity index 100% rename from test/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.tree rename to tests/integration/concrete/nft-descriptor/is-allowed-character/IsAllowedCharacter.tree diff --git a/test/integration/concrete/nft-descriptor/map-symbol/mapSymbol.t.sol b/tests/integration/concrete/nft-descriptor/map-symbol/mapSymbol.t.sol similarity index 95% rename from test/integration/concrete/nft-descriptor/map-symbol/mapSymbol.t.sol rename to tests/integration/concrete/nft-descriptor/map-symbol/mapSymbol.t.sol index 3bf72d4ff..d27c69886 100644 --- a/test/integration/concrete/nft-descriptor/map-symbol/mapSymbol.t.sol +++ b/tests/integration/concrete/nft-descriptor/map-symbol/mapSymbol.t.sol @@ -6,7 +6,7 @@ import { MockERC721 } from "forge-std/src/mocks/MockERC721.sol"; import { Errors } from "src/libraries/Errors.sol"; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract MapSymbol_Integration_Concrete_Test is Base_Test { function test_RevertGiven_UnknownNFTContract() external { diff --git a/test/integration/concrete/nft-descriptor/map-symbol/mapSymbol.tree b/tests/integration/concrete/nft-descriptor/map-symbol/mapSymbol.tree similarity index 100% rename from test/integration/concrete/nft-descriptor/map-symbol/mapSymbol.tree rename to tests/integration/concrete/nft-descriptor/map-symbol/mapSymbol.tree diff --git a/test/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.t.sol b/tests/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.t.sol similarity index 95% rename from test/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.t.sol rename to tests/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.t.sol index c187c7580..2955c3008 100644 --- a/test/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.t.sol +++ b/tests/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract SafeAssetDecimals_Integration_Concrete_Test is Base_Test { function test_WhenAssetNotContract() external view { diff --git a/test/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.tree b/tests/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.tree similarity index 100% rename from test/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.tree rename to tests/integration/concrete/nft-descriptor/safe-asset-decimals/safeAssetDecimals.tree diff --git a/test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol b/tests/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol similarity index 93% rename from test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol rename to tests/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol index b2810a3dd..b76d97007 100644 --- a/test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol +++ b/tests/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; -import { ERC20Bytes32 } from "test/mocks/erc20/ERC20Bytes32.sol"; -import { ERC20Mock } from "test/mocks/erc20/ERC20Mock.sol"; +import { Base_Test } from "tests/Base.t.sol"; +import { ERC20Bytes32 } from "tests/mocks/erc20/ERC20Bytes32.sol"; +import { ERC20Mock } from "tests/mocks/erc20/ERC20Mock.sol"; contract SafeAssetSymbol_Integration_Concrete_Test is Base_Test { function test_WhenAssetNotContract() external view { diff --git a/test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.tree b/tests/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.tree similarity index 100% rename from test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.tree rename to tests/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.tree diff --git a/test/integration/fuzz/lockup-base/cancel.t.sol b/tests/integration/fuzz/lockup-base/cancel.t.sol similarity index 100% rename from test/integration/fuzz/lockup-base/cancel.t.sol rename to tests/integration/fuzz/lockup-base/cancel.t.sol diff --git a/test/integration/fuzz/lockup-base/refundableAmountOf.t.sol b/tests/integration/fuzz/lockup-base/refundableAmountOf.t.sol similarity index 100% rename from test/integration/fuzz/lockup-base/refundableAmountOf.t.sol rename to tests/integration/fuzz/lockup-base/refundableAmountOf.t.sol diff --git a/test/integration/fuzz/lockup-base/withdraw.t.sol b/tests/integration/fuzz/lockup-base/withdraw.t.sol similarity index 100% rename from test/integration/fuzz/lockup-base/withdraw.t.sol rename to tests/integration/fuzz/lockup-base/withdraw.t.sol diff --git a/test/integration/fuzz/lockup-base/withdrawMax.t.sol b/tests/integration/fuzz/lockup-base/withdrawMax.t.sol similarity index 100% rename from test/integration/fuzz/lockup-base/withdrawMax.t.sol rename to tests/integration/fuzz/lockup-base/withdrawMax.t.sol diff --git a/test/integration/fuzz/lockup-base/withdrawMaxAndTransfer.t.sol b/tests/integration/fuzz/lockup-base/withdrawMaxAndTransfer.t.sol similarity index 100% rename from test/integration/fuzz/lockup-base/withdrawMaxAndTransfer.t.sol rename to tests/integration/fuzz/lockup-base/withdrawMaxAndTransfer.t.sol diff --git a/test/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol b/tests/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol similarity index 100% rename from test/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol rename to tests/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol diff --git a/test/integration/fuzz/lockup-dynamic/createWithDurationsLD.t.sol b/tests/integration/fuzz/lockup-dynamic/createWithDurationsLD.t.sol similarity index 100% rename from test/integration/fuzz/lockup-dynamic/createWithDurationsLD.t.sol rename to tests/integration/fuzz/lockup-dynamic/createWithDurationsLD.t.sol diff --git a/test/integration/fuzz/lockup-dynamic/createWithTimestampsLD.t.sol b/tests/integration/fuzz/lockup-dynamic/createWithTimestampsLD.t.sol similarity index 100% rename from test/integration/fuzz/lockup-dynamic/createWithTimestampsLD.t.sol rename to tests/integration/fuzz/lockup-dynamic/createWithTimestampsLD.t.sol diff --git a/test/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol b/tests/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol similarity index 100% rename from test/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol rename to tests/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol diff --git a/test/integration/fuzz/lockup-dynamic/withdraw.t.sol b/tests/integration/fuzz/lockup-dynamic/withdraw.t.sol similarity index 100% rename from test/integration/fuzz/lockup-dynamic/withdraw.t.sol rename to tests/integration/fuzz/lockup-dynamic/withdraw.t.sol diff --git a/test/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol b/tests/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol similarity index 100% rename from test/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol rename to tests/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol diff --git a/test/integration/fuzz/lockup-linear/LockupLinear.t.sol b/tests/integration/fuzz/lockup-linear/LockupLinear.t.sol similarity index 100% rename from test/integration/fuzz/lockup-linear/LockupLinear.t.sol rename to tests/integration/fuzz/lockup-linear/LockupLinear.t.sol diff --git a/test/integration/fuzz/lockup-linear/createWithDurationsLL.t.sol b/tests/integration/fuzz/lockup-linear/createWithDurationsLL.t.sol similarity index 100% rename from test/integration/fuzz/lockup-linear/createWithDurationsLL.t.sol rename to tests/integration/fuzz/lockup-linear/createWithDurationsLL.t.sol diff --git a/test/integration/fuzz/lockup-linear/createWithTimestampsLL.t.sol b/tests/integration/fuzz/lockup-linear/createWithTimestampsLL.t.sol similarity index 100% rename from test/integration/fuzz/lockup-linear/createWithTimestampsLL.t.sol rename to tests/integration/fuzz/lockup-linear/createWithTimestampsLL.t.sol diff --git a/test/integration/fuzz/lockup-linear/streamedAmountOf.t.sol b/tests/integration/fuzz/lockup-linear/streamedAmountOf.t.sol similarity index 100% rename from test/integration/fuzz/lockup-linear/streamedAmountOf.t.sol rename to tests/integration/fuzz/lockup-linear/streamedAmountOf.t.sol diff --git a/test/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol b/tests/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol similarity index 100% rename from test/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol rename to tests/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol diff --git a/test/integration/fuzz/lockup-tranched/LockupTranched.t.sol b/tests/integration/fuzz/lockup-tranched/LockupTranched.t.sol similarity index 100% rename from test/integration/fuzz/lockup-tranched/LockupTranched.t.sol rename to tests/integration/fuzz/lockup-tranched/LockupTranched.t.sol diff --git a/test/integration/fuzz/lockup-tranched/createWithDurationsLT.t.sol b/tests/integration/fuzz/lockup-tranched/createWithDurationsLT.t.sol similarity index 100% rename from test/integration/fuzz/lockup-tranched/createWithDurationsLT.t.sol rename to tests/integration/fuzz/lockup-tranched/createWithDurationsLT.t.sol diff --git a/test/integration/fuzz/lockup-tranched/createWithTimestampsLT.t.sol b/tests/integration/fuzz/lockup-tranched/createWithTimestampsLT.t.sol similarity index 100% rename from test/integration/fuzz/lockup-tranched/createWithTimestampsLT.t.sol rename to tests/integration/fuzz/lockup-tranched/createWithTimestampsLT.t.sol diff --git a/test/integration/fuzz/lockup-tranched/streamedAmountOf.t.sol b/tests/integration/fuzz/lockup-tranched/streamedAmountOf.t.sol similarity index 100% rename from test/integration/fuzz/lockup-tranched/streamedAmountOf.t.sol rename to tests/integration/fuzz/lockup-tranched/streamedAmountOf.t.sol diff --git a/test/integration/fuzz/lockup-tranched/withdraw.t.sol b/tests/integration/fuzz/lockup-tranched/withdraw.t.sol similarity index 100% rename from test/integration/fuzz/lockup-tranched/withdraw.t.sol rename to tests/integration/fuzz/lockup-tranched/withdraw.t.sol diff --git a/test/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol b/tests/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol similarity index 100% rename from test/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol rename to tests/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol diff --git a/test/integration/fuzz/nft-descriptor/isAllowedCharacter.t.sol b/tests/integration/fuzz/nft-descriptor/isAllowedCharacter.t.sol similarity index 97% rename from test/integration/fuzz/nft-descriptor/isAllowedCharacter.t.sol rename to tests/integration/fuzz/nft-descriptor/isAllowedCharacter.t.sol index b0c493e78..8cd405a0f 100644 --- a/test/integration/fuzz/nft-descriptor/isAllowedCharacter.t.sol +++ b/tests/integration/fuzz/nft-descriptor/isAllowedCharacter.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract IsAllowedCharacter_Integration_Fuzz_Test is Base_Test { bytes1 internal constant SPACE = 0x20; // ASCII 32 diff --git a/test/invariant/Invariant.t.sol b/tests/invariant/Invariant.t.sol similarity index 100% rename from test/invariant/Invariant.t.sol rename to tests/invariant/Invariant.t.sol diff --git a/test/invariant/handlers/BaseHandler.sol b/tests/invariant/handlers/BaseHandler.sol similarity index 100% rename from test/invariant/handlers/BaseHandler.sol rename to tests/invariant/handlers/BaseHandler.sol diff --git a/test/invariant/handlers/LockupCreateHandler.sol b/tests/invariant/handlers/LockupCreateHandler.sol similarity index 99% rename from test/invariant/handlers/LockupCreateHandler.sol rename to tests/invariant/handlers/LockupCreateHandler.sol index 861e6d472..3d68e3176 100644 --- a/test/invariant/handlers/LockupCreateHandler.sol +++ b/tests/invariant/handlers/LockupCreateHandler.sol @@ -6,7 +6,7 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { ISablierLockup } from "src/interfaces/ISablierLockup.sol"; import { Lockup, LockupDynamic, LockupLinear, LockupTranched } from "src/types/DataTypes.sol"; -import { Calculations } from "test/utils/Calculations.sol"; +import { Calculations } from "tests/utils/Calculations.sol"; import { LockupStore } from "../stores/LockupStore.sol"; import { BaseHandler } from "./BaseHandler.sol"; diff --git a/test/invariant/handlers/LockupHandler.sol b/tests/invariant/handlers/LockupHandler.sol similarity index 100% rename from test/invariant/handlers/LockupHandler.sol rename to tests/invariant/handlers/LockupHandler.sol diff --git a/test/invariant/stores/LockupStore.sol b/tests/invariant/stores/LockupStore.sol similarity index 100% rename from test/invariant/stores/LockupStore.sol rename to tests/invariant/stores/LockupStore.sol diff --git a/test/mocks/AdminableMock.sol b/tests/mocks/AdminableMock.sol similarity index 100% rename from test/mocks/AdminableMock.sol rename to tests/mocks/AdminableMock.sol diff --git a/test/mocks/Hooks.sol b/tests/mocks/Hooks.sol similarity index 100% rename from test/mocks/Hooks.sol rename to tests/mocks/Hooks.sol diff --git a/test/mocks/NFTDescriptorMock.sol b/tests/mocks/NFTDescriptorMock.sol similarity index 100% rename from test/mocks/NFTDescriptorMock.sol rename to tests/mocks/NFTDescriptorMock.sol diff --git a/test/mocks/Noop.sol b/tests/mocks/Noop.sol similarity index 100% rename from test/mocks/Noop.sol rename to tests/mocks/Noop.sol diff --git a/test/mocks/Receive.sol b/tests/mocks/Receive.sol similarity index 100% rename from test/mocks/Receive.sol rename to tests/mocks/Receive.sol diff --git a/test/mocks/erc20/ERC20Bytes32.sol b/tests/mocks/erc20/ERC20Bytes32.sol similarity index 100% rename from test/mocks/erc20/ERC20Bytes32.sol rename to tests/mocks/erc20/ERC20Bytes32.sol diff --git a/test/mocks/erc20/ERC20MissingReturn.sol b/tests/mocks/erc20/ERC20MissingReturn.sol similarity index 100% rename from test/mocks/erc20/ERC20MissingReturn.sol rename to tests/mocks/erc20/ERC20MissingReturn.sol diff --git a/test/mocks/erc20/ERC20Mock.sol b/tests/mocks/erc20/ERC20Mock.sol similarity index 100% rename from test/mocks/erc20/ERC20Mock.sol rename to tests/mocks/erc20/ERC20Mock.sol diff --git a/test/unit/concrete/adminable/transfer-admin/transferAdmin.t.sol b/tests/unit/concrete/adminable/transfer-admin/transferAdmin.t.sol similarity index 100% rename from test/unit/concrete/adminable/transfer-admin/transferAdmin.t.sol rename to tests/unit/concrete/adminable/transfer-admin/transferAdmin.t.sol diff --git a/test/unit/concrete/adminable/transfer-admin/transferAdmin.tree b/tests/unit/concrete/adminable/transfer-admin/transferAdmin.tree similarity index 100% rename from test/unit/concrete/adminable/transfer-admin/transferAdmin.tree rename to tests/unit/concrete/adminable/transfer-admin/transferAdmin.tree diff --git a/test/unit/concrete/nft-descriptor/abbreviateAmount.t.sol b/tests/unit/concrete/nft-descriptor/abbreviateAmount.t.sol similarity index 99% rename from test/unit/concrete/nft-descriptor/abbreviateAmount.t.sol rename to tests/unit/concrete/nft-descriptor/abbreviateAmount.t.sol index fc8855706..1d701f1c0 100644 --- a/test/unit/concrete/nft-descriptor/abbreviateAmount.t.sol +++ b/tests/unit/concrete/nft-descriptor/abbreviateAmount.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.22 <0.9.0; import { SVGElements } from "src/libraries/SVGElements.sol"; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract AbbreviateAmount_Unit_Concrete_Test is Base_Test { function aa(uint256 amount, uint256 decimals) internal view returns (string memory) { diff --git a/test/unit/concrete/nft-descriptor/calculateDurationInDays.t.sol b/tests/unit/concrete/nft-descriptor/calculateDurationInDays.t.sol similarity index 98% rename from test/unit/concrete/nft-descriptor/calculateDurationInDays.t.sol rename to tests/unit/concrete/nft-descriptor/calculateDurationInDays.t.sol index 0dbf04b4d..32215f08d 100644 --- a/test/unit/concrete/nft-descriptor/calculateDurationInDays.t.sol +++ b/tests/unit/concrete/nft-descriptor/calculateDurationInDays.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.22 <0.9.0; import { SVGElements } from "src/libraries/SVGElements.sol"; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract CalculateDurationInDays_Unit_Concrete_Test is Base_Test { function test_CalculateDurationInDays_Zero() external view { diff --git a/test/unit/concrete/nft-descriptor/calculatePixelWidth.t.sol b/tests/unit/concrete/nft-descriptor/calculatePixelWidth.t.sol similarity index 98% rename from test/unit/concrete/nft-descriptor/calculatePixelWidth.t.sol rename to tests/unit/concrete/nft-descriptor/calculatePixelWidth.t.sol index cf155e905..ca9294344 100644 --- a/test/unit/concrete/nft-descriptor/calculatePixelWidth.t.sol +++ b/tests/unit/concrete/nft-descriptor/calculatePixelWidth.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract CalculatePixelWidth_Unit_Concrete_Test is Base_Test { uint256 internal constant CHAR_WIDTH_LARGE = 16; diff --git a/test/unit/concrete/nft-descriptor/calculateStreamedPercentage.t.sol b/tests/unit/concrete/nft-descriptor/calculateStreamedPercentage.t.sol similarity index 96% rename from test/unit/concrete/nft-descriptor/calculateStreamedPercentage.t.sol rename to tests/unit/concrete/nft-descriptor/calculateStreamedPercentage.t.sol index 96895caa9..5a4b618de 100644 --- a/test/unit/concrete/nft-descriptor/calculateStreamedPercentage.t.sol +++ b/tests/unit/concrete/nft-descriptor/calculateStreamedPercentage.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract CalculateStreamedPercentage_Unit_Concrete_Test is Base_Test { function test_CalculateStreamedPercentage_Zero() external view { diff --git a/test/unit/concrete/nft-descriptor/generateAttributes.t.sol b/tests/unit/concrete/nft-descriptor/generateAttributes.t.sol similarity index 95% rename from test/unit/concrete/nft-descriptor/generateAttributes.t.sol rename to tests/unit/concrete/nft-descriptor/generateAttributes.t.sol index 47c8db24b..a190b2155 100644 --- a/test/unit/concrete/nft-descriptor/generateAttributes.t.sol +++ b/tests/unit/concrete/nft-descriptor/generateAttributes.t.sol @@ -2,7 +2,7 @@ // solhint-disable max-line-length,quotes pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract GenerateAttributes_Unit_Concrete_Test is Base_Test { function test_GenerateAttributes_Empty() external view { diff --git a/test/unit/concrete/nft-descriptor/generateDescription.t.sol b/tests/unit/concrete/nft-descriptor/generateDescription.t.sol similarity index 98% rename from test/unit/concrete/nft-descriptor/generateDescription.t.sol rename to tests/unit/concrete/nft-descriptor/generateDescription.t.sol index acad1755b..683f58e8e 100644 --- a/test/unit/concrete/nft-descriptor/generateDescription.t.sol +++ b/tests/unit/concrete/nft-descriptor/generateDescription.t.sol @@ -2,7 +2,7 @@ // solhint-disable max-line-length,quotes pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract GenerateDescription_Unit_Concrete_Test is Base_Test { string internal constant INFO_NON_TRANSFERABLE = diff --git a/test/unit/concrete/nft-descriptor/generateName.t.sol b/tests/unit/concrete/nft-descriptor/generateName.t.sol similarity index 97% rename from test/unit/concrete/nft-descriptor/generateName.t.sol rename to tests/unit/concrete/nft-descriptor/generateName.t.sol index b80b938b2..df500835d 100644 --- a/test/unit/concrete/nft-descriptor/generateName.t.sol +++ b/tests/unit/concrete/nft-descriptor/generateName.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract GenerateName_Unit_Concrete_Test is Base_Test { function gn(string memory lockupModel, string memory streamId) internal view returns (string memory) { diff --git a/test/unit/concrete/nft-descriptor/generateSVG.t.sol b/tests/unit/concrete/nft-descriptor/generateSVG.t.sol similarity index 99% rename from test/unit/concrete/nft-descriptor/generateSVG.t.sol rename to tests/unit/concrete/nft-descriptor/generateSVG.t.sol index 451e564e8..68187cfee 100644 --- a/test/unit/concrete/nft-descriptor/generateSVG.t.sol +++ b/tests/unit/concrete/nft-descriptor/generateSVG.t.sol @@ -5,7 +5,7 @@ pragma solidity >=0.8.22 <0.9.0; import { NFTSVG } from "src/libraries/NFTSVG.sol"; import { SVGElements } from "src/libraries/SVGElements.sol"; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract GenerateSVG_Unit_Concrete_Test is Base_Test { /// @dev If you need to update the hard-coded token URI: diff --git a/test/unit/concrete/nft-descriptor/hourglass.t.sol b/tests/unit/concrete/nft-descriptor/hourglass.t.sol similarity index 97% rename from test/unit/concrete/nft-descriptor/hourglass.t.sol rename to tests/unit/concrete/nft-descriptor/hourglass.t.sol index 184859180..7ee8c48a1 100644 --- a/test/unit/concrete/nft-descriptor/hourglass.t.sol +++ b/tests/unit/concrete/nft-descriptor/hourglass.t.sol @@ -5,7 +5,7 @@ import { LibString } from "solady/src/utils/LibString.sol"; import { SVGElements } from "src/libraries/SVGElements.sol"; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract Hourglass_Unit_Concrete_Test is Base_Test { using LibString for string; diff --git a/test/unit/concrete/nft-descriptor/stringifyCardType.t.sol b/tests/unit/concrete/nft-descriptor/stringifyCardType.t.sol similarity index 93% rename from test/unit/concrete/nft-descriptor/stringifyCardType.t.sol rename to tests/unit/concrete/nft-descriptor/stringifyCardType.t.sol index ad3e21634..6b97a8574 100644 --- a/test/unit/concrete/nft-descriptor/stringifyCardType.t.sol +++ b/tests/unit/concrete/nft-descriptor/stringifyCardType.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.22 <0.9.0; import { SVGElements } from "src/libraries/SVGElements.sol"; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract StringifyCardType_Unit_Concrete_Test is Base_Test { function test_StringifyCardType() external view { diff --git a/test/unit/concrete/nft-descriptor/stringifyFractionalAmount.t.sol b/tests/unit/concrete/nft-descriptor/stringifyFractionalAmount.t.sol similarity index 96% rename from test/unit/concrete/nft-descriptor/stringifyFractionalAmount.t.sol rename to tests/unit/concrete/nft-descriptor/stringifyFractionalAmount.t.sol index dc36e7ea6..e42911d88 100644 --- a/test/unit/concrete/nft-descriptor/stringifyFractionalAmount.t.sol +++ b/tests/unit/concrete/nft-descriptor/stringifyFractionalAmount.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract StringifyFractionalAmount_Unit_Concrete_Test is Base_Test { function sfa(uint256 amount) internal view returns (string memory) { diff --git a/test/unit/concrete/nft-descriptor/stringifyPercentage.t.sol b/tests/unit/concrete/nft-descriptor/stringifyPercentage.t.sol similarity index 96% rename from test/unit/concrete/nft-descriptor/stringifyPercentage.t.sol rename to tests/unit/concrete/nft-descriptor/stringifyPercentage.t.sol index 2d8dd6d59..2b028bb13 100644 --- a/test/unit/concrete/nft-descriptor/stringifyPercentage.t.sol +++ b/tests/unit/concrete/nft-descriptor/stringifyPercentage.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract StringifyPercentage_Unit_Concrete_Test is Base_Test { function sp(uint256 percentage) internal view returns (string memory) { diff --git a/test/unit/concrete/nft-descriptor/stringifyStatus.t.sol b/tests/unit/concrete/nft-descriptor/stringifyStatus.t.sol similarity index 94% rename from test/unit/concrete/nft-descriptor/stringifyStatus.t.sol rename to tests/unit/concrete/nft-descriptor/stringifyStatus.t.sol index 5bbf16c48..4a4fee282 100644 --- a/test/unit/concrete/nft-descriptor/stringifyStatus.t.sol +++ b/tests/unit/concrete/nft-descriptor/stringifyStatus.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup } from "src/types/DataTypes.sol"; -import { Base_Test } from "test/Base.t.sol"; +import { Base_Test } from "tests/Base.t.sol"; contract StringifyStatus_Unit_Concrete_Test is Base_Test { function test_StringifyStatus() external view { diff --git a/test/unit/fuzz/transferAdmin.t.sol b/tests/unit/fuzz/transferAdmin.t.sol similarity index 100% rename from test/unit/fuzz/transferAdmin.t.sol rename to tests/unit/fuzz/transferAdmin.t.sol diff --git a/test/unit/shared/Adminable.t.sol b/tests/unit/shared/Adminable.t.sol similarity index 100% rename from test/unit/shared/Adminable.t.sol rename to tests/unit/shared/Adminable.t.sol diff --git a/test/utils/.npmignore b/tests/utils/.npmignore similarity index 100% rename from test/utils/.npmignore rename to tests/utils/.npmignore diff --git a/test/utils/ArrayBuilder.sol b/tests/utils/ArrayBuilder.sol similarity index 100% rename from test/utils/ArrayBuilder.sol rename to tests/utils/ArrayBuilder.sol diff --git a/test/utils/Assertions.sol b/tests/utils/Assertions.sol similarity index 100% rename from test/utils/Assertions.sol rename to tests/utils/Assertions.sol diff --git a/test/utils/BaseScript.t.sol b/tests/utils/BaseScript.t.sol similarity index 100% rename from test/utils/BaseScript.t.sol rename to tests/utils/BaseScript.t.sol diff --git a/test/utils/BatchLockupBuilder.sol b/tests/utils/BatchLockupBuilder.sol similarity index 100% rename from test/utils/BatchLockupBuilder.sol rename to tests/utils/BatchLockupBuilder.sol diff --git a/test/utils/Calculations.sol b/tests/utils/Calculations.sol similarity index 100% rename from test/utils/Calculations.sol rename to tests/utils/Calculations.sol diff --git a/test/utils/Constants.sol b/tests/utils/Constants.sol similarity index 100% rename from test/utils/Constants.sol rename to tests/utils/Constants.sol diff --git a/test/utils/Defaults.sol b/tests/utils/Defaults.sol similarity index 100% rename from test/utils/Defaults.sol rename to tests/utils/Defaults.sol diff --git a/test/utils/DeployOptimized.sol b/tests/utils/DeployOptimized.sol similarity index 100% rename from test/utils/DeployOptimized.sol rename to tests/utils/DeployOptimized.sol diff --git a/test/utils/Fuzzers.sol b/tests/utils/Fuzzers.sol similarity index 100% rename from test/utils/Fuzzers.sol rename to tests/utils/Fuzzers.sol diff --git a/test/utils/Modifiers.sol b/tests/utils/Modifiers.sol similarity index 100% rename from test/utils/Modifiers.sol rename to tests/utils/Modifiers.sol diff --git a/test/utils/Precompiles.t.sol b/tests/utils/Precompiles.t.sol similarity index 100% rename from test/utils/Precompiles.t.sol rename to tests/utils/Precompiles.t.sol diff --git a/test/utils/Types.sol b/tests/utils/Types.sol similarity index 100% rename from test/utils/Types.sol rename to tests/utils/Types.sol diff --git a/test/utils/Utils.sol b/tests/utils/Utils.sol similarity index 100% rename from test/utils/Utils.sol rename to tests/utils/Utils.sol