From d05f2cacf45a80e5b9e8859a67b2841baeee3fbe Mon Sep 17 00:00:00 2001 From: smol-ninja Date: Mon, 26 Aug 2024 22:48:57 +0100 Subject: [PATCH] chore: bump solhint, integrate Husky and lint-staged --- .husky/pre-commit | 2 + .lintstagedrc.yml | 4 ++ .solhint.json | 1 + bun.lockb | Bin 43717 -> 64119 bytes package.json | 7 +- precompiles/Precompiles.sol | 22 +++--- script/DeployDeterministicProtocol.s.sol | 13 ++-- script/DeployProtocol.s.sol | 13 ++-- script/core/GenerateSVG.s.sol | 10 ++- script/periphery/DeployPeriphery.s.sol | 7 +- src/core/LockupNFTDescriptor.sol | 4 +- src/core/abstracts/SablierLockup.sol | 11 ++- src/periphery/abstracts/SablierMerkleBase.sol | 10 ++- src/periphery/interfaces/ISablierMerkleLT.sol | 5 +- test/Base.t.sol | 6 +- test/core/fork/Fork.t.sol | 5 +- .../lockup-dynamic/LockupDynamic.t.sol | 65 +++++++++--------- .../createWithTimestamps.t.sol | 8 +-- .../streamed-amount-of/streamedAmountOf.t.sol | 5 +- .../withdrawableAmountOf.t.sol | 4 +- .../concrete/lockup-linear/LockupLinear.t.sol | 65 +++++++++--------- .../createWithTimestamps.t.sol | 8 +-- .../streamed-amount-of/streamedAmountOf.t.sol | 5 +- .../withdrawableAmountOf.t.sol | 4 +- .../lockup-tranched/LockupTranched.t.sol | 65 +++++++++--------- .../createWithTimestamps.t.sol | 8 +-- .../streamed-amount-of/streamedAmountOf.t.sol | 4 +- .../withdrawableAmountOf.t.sol | 4 +- .../lockup/allow-to-hook/allowToHook.t.sol | 5 +- .../concrete/lockup/burn/burn.t.sol | 6 +- .../concrete/lockup/cancel/cancel.t.sol | 6 +- .../concrete/lockup/get-asset/getAsset.t.sol | 6 +- .../getDepositedAmount.t.sol | 5 +- .../lockup/get-end-time/getEndTime.t.sol | 5 +- .../lockup/get-recipient/getRecipient.t.sol | 5 +- .../getRefundedAmount.t.sol | 5 +- .../lockup/get-sender/getSender.t.sol | 5 +- .../lockup/get-start-time/getStartTime.t.sol | 5 +- .../getWithdrawnAmount.t.sol | 5 +- .../is-allowed-to-hook/isAllowedToHook.t.sol | 4 +- .../lockup/is-cancelable/isCancelable.t.sol | 5 +- .../concrete/lockup/is-cold/isCold.t.sol | 5 +- .../lockup/is-depleted/isDepleted.t.sol | 5 +- .../concrete/lockup/is-stream/isStream.t.sol | 4 +- .../is-transferable/isTransferable.t.sol | 5 +- .../concrete/lockup/is-warm/isWarm.t.sol | 5 +- .../refundableAmountOf.t.sol | 5 +- .../concrete/lockup/renounce/renounce.t.sol | 5 +- .../set-nft-descriptor/setNFTDescriptor.t.sol | 5 +- .../concrete/lockup/status-of/statusOf.t.sol | 5 +- .../streamed-amount-of/streamedAmountOf.t.sol | 5 +- .../lockup/transfer-from/transferFrom.t.sol | 5 +- .../lockup/was-canceled/wasCanceled.t.sol | 5 +- .../withdrawMaxAndTransfer.t.sol | 5 +- .../lockup/withdraw-max/withdrawMax.t.sol | 5 +- .../withdraw-multiple/withdrawMultiple.t.sol | 6 +- .../concrete/lockup/withdraw/withdraw.t.sol | 6 +- .../withdrawableAmountOf.t.sol | 5 +- .../safe-asset-symbol/safeAssetSymbol.t.sol | 4 +- .../fuzz/lockup-dynamic/LockupDynamic.t.sol | 19 +++-- .../lockup-dynamic/withdrawableAmountOf.t.sol | 3 +- .../fuzz/lockup-linear/LockupLinear.t.sol | 21 +++--- .../lockup-linear/withdrawableAmountOf.t.sol | 3 +- .../fuzz/lockup-tranched/LockupTranched.t.sol | 19 +++-- .../withdrawableAmountOf.t.sol | 4 +- .../core/integration/fuzz/lockup/cancel.t.sol | 5 +- .../fuzz/lockup/getWithdrawnAmount.t.sol | 4 +- .../fuzz/lockup/refundableAmountOf.t.sol | 4 +- .../integration/fuzz/lockup/withdraw.t.sol | 5 +- .../integration/fuzz/lockup/withdrawMax.t.sol | 5 +- .../fuzz/lockup/withdrawMaxAndTransfer.t.sol | 4 +- .../fuzz/lockup/withdrawMultiple.t.sol | 6 +- .../shared/nft-descriptor/NFTDescriptor.t.sol | 2 +- test/core/invariant/Lockup.t.sol | 3 +- test/core/invariant/LockupDynamic.t.sol | 3 +- test/core/invariant/LockupLinear.t.sol | 5 +- test/core/invariant/LockupTranched.t.sol | 3 +- .../nft-descriptor/NFTDescriptor.t.sol | 3 +- test/mocks/NFTDescriptorMock.sol | 3 +- test/periphery/fork/Fork.t.sol | 6 +- .../fork/merkle-campaign/MerkleInstant.t.sol | 8 +-- .../fork/merkle-campaign/MerkleLL.t.sol | 8 +-- .../fork/merkle-campaign/MerkleLT.t.sol | 8 +-- .../merkle-campaign/instant/claim/claim.t.sol | 4 +- .../merkle-campaign/ll/claim/claim.t.sol | 2 +- test/utils/Defaults.sol | 6 +- test/utils/Precompiles.t.sol | 6 +- 87 files changed, 312 insertions(+), 382 deletions(-) create mode 100644 .husky/pre-commit create mode 100644 .lintstagedrc.yml diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 000000000..6dff11c79 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,2 @@ +#!/bin/sh +bun lint-staged diff --git a/.lintstagedrc.yml b/.lintstagedrc.yml new file mode 100644 index 000000000..3b310bf20 --- /dev/null +++ b/.lintstagedrc.yml @@ -0,0 +1,4 @@ +"*.{json,md,svg,yml}": "prettier --write" +"*.sol": + - "bun solhint --fix --noPrompt" + - "forge fmt" diff --git a/.solhint.json b/.solhint.json index d9bf4b91a..63dd2f71c 100644 --- a/.solhint.json +++ b/.solhint.json @@ -9,6 +9,7 @@ "func-name-mixedcase": "off", "func-visibility": ["error", { "ignoreConstructors": true }], "gas-custom-errors": "off", + "imports-order": "warn", "max-line-length": ["error", 124], "named-parameters-mapping": "warn", "no-empty-blocks": "off", diff --git a/bun.lockb b/bun.lockb index 50714ba61be90989f507d79fdc274ae11e21609d..dae3e9c4e9bb2b3527d75adbfdf3f2526f0586dc 100755 GIT binary patch delta 18801 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 delta 6370 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 diff --git a/package.json b/package.json index bc9973c2e..937411579 100644 --- a/package.json +++ b/package.json @@ -16,10 +16,12 @@ }, "devDependencies": { "forge-std": "github:foundry-rs/forge-std#v1.8.2", + "husky": "^9.1.4", + "lint-staged": "^15.2.8", "prettier": "^3.3.2", "solady": "0.0.208", "solarray": "github:evmcheb/solarray#a547630", - "solhint": "^5.0.1" + "solhint": "^5.0.3" }, "files": [ "artifacts", @@ -66,8 +68,11 @@ "build:smt": "FOUNDRY_PROFILE=smt forge build", "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", "prepack": "bun install && bash ./shell/prepare-artifacts.sh", + "prepare": "husky", "prettier:check": "prettier --check \"**/*.{json,md,svg,yml}\"", "prettier:write": "prettier --write \"**/*.{json,md,svg,yml}\"", "test": "forge test", diff --git a/precompiles/Precompiles.sol b/precompiles/Precompiles.sol index 466f61595..69a1d083f 100644 --- a/precompiles/Precompiles.sol +++ b/precompiles/Precompiles.sol @@ -2,13 +2,13 @@ // solhint-disable max-line-length,no-inline-assembly,reason-string pragma solidity >=0.8.22; -import { ILockupNFTDescriptor } from "../src/core/interfaces/ILockupNFTDescriptor.sol"; -import { LockupNFTDescriptor } from "../src/core/LockupNFTDescriptor.sol"; -import { ISablierLockupDynamic } from "../src/core/interfaces/ISablierLockupDynamic.sol"; -import { ISablierLockupLinear } from "../src/core/interfaces/ISablierLockupLinear.sol"; -import { ISablierLockupTranched } from "../src/core/interfaces/ISablierLockupTranched.sol"; -import { ISablierBatchLockup } from "../src/periphery/interfaces/ISablierBatchLockup.sol"; -import { ISablierMerkleFactory } from "../src/periphery/interfaces/ISablierMerkleFactory.sol"; +import { ILockupNFTDescriptor } from "./../src/core/interfaces/ILockupNFTDescriptor.sol"; +import { ISablierLockupDynamic } from "./../src/core/interfaces/ISablierLockupDynamic.sol"; +import { ISablierLockupLinear } from "./../src/core/interfaces/ISablierLockupLinear.sol"; +import { ISablierLockupTranched } from "./../src/core/interfaces/ISablierLockupTranched.sol"; +import { LockupNFTDescriptor } from "./../src/core/LockupNFTDescriptor.sol"; +import { ISablierBatchLockup } from "./../src/periphery/interfaces/ISablierBatchLockup.sol"; +import { ISablierMerkleFactory } from "./../src/periphery/interfaces/ISablierMerkleFactory.sol"; /// @notice This is useful for external integrations seeking to test against the exact deployed bytecode, as recompiling /// with via IR enabled would be time-consuming. @@ -182,7 +182,9 @@ contract Precompiles { } /// @notice Deploys all Core contracts. - function deployCore(address initialAdmin) + function deployCore( + address initialAdmin + ) public returns ( ILockupNFTDescriptor nftDescriptor, @@ -236,7 +238,9 @@ contract Precompiles { /// 4. {SablierLockupTranched} /// 5. {SablierBatchLockup} /// 6. {SablierMerkleFactory} - function deployProtocol(address initialAdmin) + function deployProtocol( + address initialAdmin + ) public returns ( ILockupNFTDescriptor nftDescriptor, diff --git a/script/DeployDeterministicProtocol.s.sol b/script/DeployDeterministicProtocol.s.sol index ca753bd5c..6f1b5eb6a 100644 --- a/script/DeployDeterministicProtocol.s.sol +++ b/script/DeployDeterministicProtocol.s.sol @@ -1,13 +1,12 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.22 <0.9.0; -import { LockupNFTDescriptor } from "../src/core/LockupNFTDescriptor.sol"; -import { SablierLockupDynamic } from "../src/core/SablierLockupDynamic.sol"; -import { SablierLockupLinear } from "../src/core/SablierLockupLinear.sol"; -import { SablierLockupTranched } from "../src/core/SablierLockupTranched.sol"; -import { SablierMerkleFactory } from "../src/periphery/SablierMerkleFactory.sol"; -import { SablierBatchLockup } from "../src/periphery/SablierBatchLockup.sol"; - +import { LockupNFTDescriptor } from "./../src/core/LockupNFTDescriptor.sol"; +import { SablierLockupDynamic } from "./../src/core/SablierLockupDynamic.sol"; +import { SablierLockupLinear } from "./../src/core/SablierLockupLinear.sol"; +import { SablierLockupTranched } from "./../src/core/SablierLockupTranched.sol"; +import { SablierBatchLockup } from "./../src/periphery/SablierBatchLockup.sol"; +import { SablierMerkleFactory } from "./../src/periphery/SablierMerkleFactory.sol"; import { BaseScript } from "./Base.s.sol"; /// @notice Deploys the Lockup Protocol at deterministic addresses across chains. diff --git a/script/DeployProtocol.s.sol b/script/DeployProtocol.s.sol index 07fd2ad46..1631ef306 100644 --- a/script/DeployProtocol.s.sol +++ b/script/DeployProtocol.s.sol @@ -1,13 +1,12 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.22 <0.9.0; -import { LockupNFTDescriptor } from "../src/core/LockupNFTDescriptor.sol"; -import { SablierLockupDynamic } from "../src/core/SablierLockupDynamic.sol"; -import { SablierLockupLinear } from "../src/core/SablierLockupLinear.sol"; -import { SablierLockupTranched } from "../src/core/SablierLockupTranched.sol"; -import { SablierMerkleFactory } from "../src/periphery/SablierMerkleFactory.sol"; -import { SablierBatchLockup } from "../src/periphery/SablierBatchLockup.sol"; - +import { LockupNFTDescriptor } from "./../src/core/LockupNFTDescriptor.sol"; +import { SablierLockupDynamic } from "./../src/core/SablierLockupDynamic.sol"; +import { SablierLockupLinear } from "./../src/core/SablierLockupLinear.sol"; +import { SablierLockupTranched } from "./../src/core/SablierLockupTranched.sol"; +import { SablierBatchLockup } from "./../src/periphery/SablierBatchLockup.sol"; +import { SablierMerkleFactory } from "./../src/periphery/SablierMerkleFactory.sol"; import { BaseScript } from "./Base.s.sol"; /// @notice Deploys the Lockup Protocol. diff --git a/script/core/GenerateSVG.s.sol b/script/core/GenerateSVG.s.sol index 5f559ffac..33b919841 100644 --- a/script/core/GenerateSVG.s.sol +++ b/script/core/GenerateSVG.s.sol @@ -2,12 +2,10 @@ pragma solidity >=0.8.22 <0.9.0; import { Strings } from "@openzeppelin/contracts/utils/Strings.sol"; - -import { LockupNFTDescriptor } from "../../src/core/LockupNFTDescriptor.sol"; -import { NFTSVG } from "../../src/core/libraries/NFTSVG.sol"; -import { SVGElements } from "../../src/core/libraries/SVGElements.sol"; - -import { BaseScript } from "../Base.s.sol"; +import { NFTSVG } from "./../../src/core/libraries/NFTSVG.sol"; +import { SVGElements } from "./../../src/core/libraries/SVGElements.sol"; +import { LockupNFTDescriptor } from "./../../src/core/LockupNFTDescriptor.sol"; +import { BaseScript } from "./../Base.s.sol"; /// @notice Generates an NFT SVG using the user-provided parameters. contract GenerateSVG is BaseScript, LockupNFTDescriptor { diff --git a/script/periphery/DeployPeriphery.s.sol b/script/periphery/DeployPeriphery.s.sol index 9e8d554d2..17940a4d6 100644 --- a/script/periphery/DeployPeriphery.s.sol +++ b/script/periphery/DeployPeriphery.s.sol @@ -1,10 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.22 <0.9.0; -import { SablierMerkleFactory } from "../../src/periphery/SablierMerkleFactory.sol"; -import { SablierBatchLockup } from "../../src/periphery/SablierBatchLockup.sol"; - -import { BaseScript } from "../Base.s.sol"; +import { SablierBatchLockup } from "./../../src/periphery/SablierBatchLockup.sol"; +import { SablierMerkleFactory } from "./../../src/periphery/SablierMerkleFactory.sol"; +import { BaseScript } from "./../Base.s.sol"; /// @notice Deploys all Periphery contract in the following order: /// diff --git a/src/core/LockupNFTDescriptor.sol b/src/core/LockupNFTDescriptor.sol index 51161a7bf..9a57a226f 100644 --- a/src/core/LockupNFTDescriptor.sol +++ b/src/core/LockupNFTDescriptor.sol @@ -6,14 +6,12 @@ import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/I import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; import { Base64 } from "@openzeppelin/contracts/utils/Base64.sol"; import { Strings } from "@openzeppelin/contracts/utils/Strings.sol"; - import { ILockupNFTDescriptor } from "./interfaces/ILockupNFTDescriptor.sol"; import { ISablierLockup } from "./interfaces/ISablierLockup.sol"; -import { Lockup } from "./types/DataTypes.sol"; - import { Errors } from "./libraries/Errors.sol"; import { NFTSVG } from "./libraries/NFTSVG.sol"; import { SVGElements } from "./libraries/SVGElements.sol"; +import { Lockup } from "./types/DataTypes.sol"; /* diff --git a/src/core/abstracts/SablierLockup.sol b/src/core/abstracts/SablierLockup.sol index b3f067dfe..74a35d287 100644 --- a/src/core/abstracts/SablierLockup.sol +++ b/src/core/abstracts/SablierLockup.sol @@ -7,12 +7,11 @@ import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import { UD60x18 } from "@prb/math/src/UD60x18.sol"; - -import { ILockupNFTDescriptor } from "../interfaces/ILockupNFTDescriptor.sol"; -import { ISablierLockupRecipient } from "../interfaces/ISablierLockupRecipient.sol"; -import { ISablierLockup } from "../interfaces/ISablierLockup.sol"; -import { Errors } from "../libraries/Errors.sol"; -import { Lockup } from "../types/DataTypes.sol"; +import { ILockupNFTDescriptor } from "./../interfaces/ILockupNFTDescriptor.sol"; +import { ISablierLockup } from "./../interfaces/ISablierLockup.sol"; +import { ISablierLockupRecipient } from "./../interfaces/ISablierLockupRecipient.sol"; +import { Errors } from "./../libraries/Errors.sol"; +import { Lockup } from "./../types/DataTypes.sol"; import { Adminable } from "./Adminable.sol"; import { NoDelegateCall } from "./NoDelegateCall.sol"; diff --git a/src/periphery/abstracts/SablierMerkleBase.sol b/src/periphery/abstracts/SablierMerkleBase.sol index a469d5fee..efa0da9a6 100644 --- a/src/periphery/abstracts/SablierMerkleBase.sol +++ b/src/periphery/abstracts/SablierMerkleBase.sol @@ -5,12 +5,10 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { MerkleProof } from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol"; import { BitMaps } from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; - -import { Adminable } from "../../core/abstracts/Adminable.sol"; - -import { ISablierMerkleBase } from "../interfaces/ISablierMerkleBase.sol"; -import { MerkleBase } from "../types/DataTypes.sol"; -import { Errors } from "../libraries/Errors.sol"; +import { Adminable } from "./../../core/abstracts/Adminable.sol"; +import { ISablierMerkleBase } from "./../interfaces/ISablierMerkleBase.sol"; +import { Errors } from "./../libraries/Errors.sol"; +import { MerkleBase } from "./../types/DataTypes.sol"; /// @title SablierMerkleBase /// @notice See the documentation in {ISablierMerkleBase}. diff --git a/src/periphery/interfaces/ISablierMerkleLT.sol b/src/periphery/interfaces/ISablierMerkleLT.sol index 56c3a96e2..0290cbbf2 100644 --- a/src/periphery/interfaces/ISablierMerkleLT.sol +++ b/src/periphery/interfaces/ISablierMerkleLT.sol @@ -1,10 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.22; -import { ISablierLockupTranched } from "../../core/interfaces/ISablierLockupTranched.sol"; - +import { ISablierLockupTranched } from "./../../core/interfaces/ISablierLockupTranched.sol"; +import { MerkleLT } from "./../types/DataTypes.sol"; import { ISablierMerkleBase } from "./ISablierMerkleBase.sol"; -import { MerkleLT } from "../types/DataTypes.sol"; /// @title ISablierMerkleLT /// @notice Merkle Lockup campaign that creates LockupTranched streams. diff --git a/test/Base.t.sol b/test/Base.t.sol index eece1a36b..b8b18e883 100644 --- a/test/Base.t.sol +++ b/test/Base.t.sol @@ -2,7 +2,6 @@ pragma solidity >=0.8.22 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - import { ILockupNFTDescriptor } from "src/core/interfaces/ILockupNFTDescriptor.sol"; import { ISablierLockupDynamic } from "src/core/interfaces/ISablierLockupDynamic.sol"; import { ISablierLockupLinear } from "src/core/interfaces/ISablierLockupLinear.sol"; @@ -19,11 +18,10 @@ import { ISablierMerkleLL } from "src/periphery/interfaces/ISablierMerkleLL.sol" import { ISablierMerkleLT } from "src/periphery/interfaces/ISablierMerkleLT.sol"; import { SablierBatchLockup } from "src/periphery/SablierBatchLockup.sol"; import { SablierMerkleFactory } from "src/periphery/SablierMerkleFactory.sol"; - -import { ERC20Mock } from "./mocks/erc20/ERC20Mock.sol"; import { ERC20MissingReturn } from "./mocks/erc20/ERC20MissingReturn.sol"; -import { Noop } from "./mocks/Noop.sol"; +import { ERC20Mock } from "./mocks/erc20/ERC20Mock.sol"; import { RecipientGood } from "./mocks/Hooks.sol"; +import { Noop } from "./mocks/Noop.sol"; import { Assertions } from "./utils/Assertions.sol"; import { Calculations } from "./utils/Calculations.sol"; import { Constants } from "./utils/Constants.sol"; diff --git a/test/core/fork/Fork.t.sol b/test/core/fork/Fork.t.sol index a343909f3..04acc8540 100644 --- a/test/core/fork/Fork.t.sol +++ b/test/core/fork/Fork.t.sol @@ -1,10 +1,9 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; - -import { Base_Test } from "../../Base.t.sol"; +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { Base_Test } from "./../../Base.t.sol"; /// @notice Common logic needed by all fork tests. abstract contract Fork_Test is Base_Test { diff --git a/test/core/integration/concrete/lockup-dynamic/LockupDynamic.t.sol b/test/core/integration/concrete/lockup-dynamic/LockupDynamic.t.sol index fd1d8eff1..058107fae 100644 --- a/test/core/integration/concrete/lockup-dynamic/LockupDynamic.t.sol +++ b/test/core/integration/concrete/lockup-dynamic/LockupDynamic.t.sol @@ -2,40 +2,39 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; - -import { LockupDynamic_Integration_Shared_Test } from "../../shared/lockup-dynamic/LockupDynamic.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; -import { AllowToHook_Integration_Concrete_Test } from "../lockup/allow-to-hook/allowToHook.t.sol"; -import { Burn_Integration_Concrete_Test } from "../lockup/burn/burn.t.sol"; -import { Cancel_Integration_Concrete_Test } from "../lockup/cancel/cancel.t.sol"; -import { CancelMultiple_Integration_Concrete_Test } from "../lockup/cancel-multiple/cancelMultiple.t.sol"; -import { GetAsset_Integration_Concrete_Test } from "../lockup/get-asset/getAsset.t.sol"; -import { GetDepositedAmount_Integration_Concrete_Test } from "../lockup/get-deposited-amount/getDepositedAmount.t.sol"; -import { GetEndTime_Integration_Concrete_Test } from "../lockup/get-end-time/getEndTime.t.sol"; -import { GetRecipient_Integration_Concrete_Test } from "../lockup/get-recipient/getRecipient.t.sol"; -import { GetRefundedAmount_Integration_Concrete_Test } from "../lockup/get-refunded-amount/getRefundedAmount.t.sol"; -import { GetSender_Integration_Concrete_Test } from "../lockup/get-sender/getSender.t.sol"; -import { GetStartTime_Integration_Concrete_Test } from "../lockup/get-start-time/getStartTime.t.sol"; -import { GetWithdrawnAmount_Integration_Concrete_Test } from "../lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol"; -import { IsAllowedToHook_Integration_Concrete_Test } from "../lockup/is-allowed-to-hook/isAllowedToHook.t.sol"; -import { IsCancelable_Integration_Concrete_Test } from "../lockup/is-cancelable/isCancelable.t.sol"; -import { IsCold_Integration_Concrete_Test } from "../lockup/is-cold/isCold.t.sol"; -import { IsDepleted_Integration_Concrete_Test } from "../lockup/is-depleted/isDepleted.t.sol"; -import { IsStream_Integration_Concrete_Test } from "../lockup/is-stream/isStream.t.sol"; -import { IsTransferable_Integration_Concrete_Test } from "../lockup/is-transferable/isTransferable.t.sol"; -import { IsWarm_Integration_Concrete_Test } from "../lockup/is-warm/isWarm.t.sol"; -import { RefundableAmountOf_Integration_Concrete_Test } from "../lockup/refundable-amount-of/refundableAmountOf.t.sol"; -import { Renounce_Integration_Concrete_Test } from "../lockup/renounce/renounce.t.sol"; -import { SetNFTDescriptor_Integration_Concrete_Test } from "../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; -import { StatusOf_Integration_Concrete_Test } from "../lockup/status-of/statusOf.t.sol"; -import { TransferFrom_Integration_Concrete_Test } from "../lockup/transfer-from/transferFrom.t.sol"; -import { WasCanceled_Integration_Concrete_Test } from "../lockup/was-canceled/wasCanceled.t.sol"; -import { Withdraw_Integration_Concrete_Test } from "../lockup/withdraw/withdraw.t.sol"; -import { WithdrawHooks_Integration_Concrete_Test } from "../lockup/withdraw-hooks/withdrawHooks.t.sol"; -import { WithdrawMax_Integration_Concrete_Test } from "../lockup/withdraw-max/withdrawMax.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { LockupDynamic_Integration_Shared_Test } from "./../../shared/lockup-dynamic/LockupDynamic.t.sol"; +import { AllowToHook_Integration_Concrete_Test } from "./../lockup/allow-to-hook/allowToHook.t.sol"; +import { Burn_Integration_Concrete_Test } from "./../lockup/burn/burn.t.sol"; +import { CancelMultiple_Integration_Concrete_Test } from "./../lockup/cancel-multiple/cancelMultiple.t.sol"; +import { Cancel_Integration_Concrete_Test } from "./../lockup/cancel/cancel.t.sol"; +import { GetAsset_Integration_Concrete_Test } from "./../lockup/get-asset/getAsset.t.sol"; +import { GetDepositedAmount_Integration_Concrete_Test } from "./../lockup/get-deposited-amount/getDepositedAmount.t.sol"; +import { GetEndTime_Integration_Concrete_Test } from "./../lockup/get-end-time/getEndTime.t.sol"; +import { GetRecipient_Integration_Concrete_Test } from "./../lockup/get-recipient/getRecipient.t.sol"; +import { GetRefundedAmount_Integration_Concrete_Test } from "./../lockup/get-refunded-amount/getRefundedAmount.t.sol"; +import { GetSender_Integration_Concrete_Test } from "./../lockup/get-sender/getSender.t.sol"; +import { GetStartTime_Integration_Concrete_Test } from "./../lockup/get-start-time/getStartTime.t.sol"; +import { GetWithdrawnAmount_Integration_Concrete_Test } from "./../lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol"; +import { IsAllowedToHook_Integration_Concrete_Test } from "./../lockup/is-allowed-to-hook/isAllowedToHook.t.sol"; +import { IsCancelable_Integration_Concrete_Test } from "./../lockup/is-cancelable/isCancelable.t.sol"; +import { IsCold_Integration_Concrete_Test } from "./../lockup/is-cold/isCold.t.sol"; +import { IsDepleted_Integration_Concrete_Test } from "./../lockup/is-depleted/isDepleted.t.sol"; +import { IsStream_Integration_Concrete_Test } from "./../lockup/is-stream/isStream.t.sol"; +import { IsTransferable_Integration_Concrete_Test } from "./../lockup/is-transferable/isTransferable.t.sol"; +import { IsWarm_Integration_Concrete_Test } from "./../lockup/is-warm/isWarm.t.sol"; +import { RefundableAmountOf_Integration_Concrete_Test } from "./../lockup/refundable-amount-of/refundableAmountOf.t.sol"; +import { Renounce_Integration_Concrete_Test } from "./../lockup/renounce/renounce.t.sol"; +import { SetNFTDescriptor_Integration_Concrete_Test } from "./../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; +import { StatusOf_Integration_Concrete_Test } from "./../lockup/status-of/statusOf.t.sol"; +import { TransferFrom_Integration_Concrete_Test } from "./../lockup/transfer-from/transferFrom.t.sol"; +import { WasCanceled_Integration_Concrete_Test } from "./../lockup/was-canceled/wasCanceled.t.sol"; +import { WithdrawHooks_Integration_Concrete_Test } from "./../lockup/withdraw-hooks/withdrawHooks.t.sol"; import { WithdrawMaxAndTransfer_Integration_Concrete_Test } from - "../lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol"; -import { WithdrawMultiple_Integration_Concrete_Test } from "../lockup/withdraw-multiple/withdrawMultiple.t.sol"; + "./../lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol"; +import { WithdrawMax_Integration_Concrete_Test } from "./../lockup/withdraw-max/withdrawMax.t.sol"; +import { WithdrawMultiple_Integration_Concrete_Test } from "./../lockup/withdraw-multiple/withdrawMultiple.t.sol"; +import { Withdraw_Integration_Concrete_Test } from "./../lockup/withdraw/withdraw.t.sol"; /*////////////////////////////////////////////////////////////////////////// NON-SHARED ABSTRACT TEST diff --git a/test/core/integration/concrete/lockup-dynamic/create-with-timestamps/createWithTimestamps.t.sol b/test/core/integration/concrete/lockup-dynamic/create-with-timestamps/createWithTimestamps.t.sol index 0fbcd9357..015934379 100644 --- a/test/core/integration/concrete/lockup-dynamic/create-with-timestamps/createWithTimestamps.t.sol +++ b/test/core/integration/concrete/lockup-dynamic/create-with-timestamps/createWithTimestamps.t.sol @@ -1,18 +1,16 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { IERC721Errors } from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { stdError } from "forge-std/src/StdError.sol"; - import { ISablierLockupDynamic } from "src/core/interfaces/ISablierLockupDynamic.sol"; import { Errors } from "src/core/libraries/Errors.sol"; import { Broker, Lockup, LockupDynamic } from "src/core/types/DataTypes.sol"; - -import { CreateWithTimestamps_Integration_Shared_Test } from "../../../shared/lockup/createWithTimestamps.t.sol"; -import { LockupDynamic_Integration_Concrete_Test } from "../LockupDynamic.t.sol"; +import { CreateWithTimestamps_Integration_Shared_Test } from "./../../../shared/lockup/createWithTimestamps.t.sol"; +import { LockupDynamic_Integration_Concrete_Test } from "./../LockupDynamic.t.sol"; contract CreateWithTimestamps_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol b/test/core/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol index c6d439555..797187f86 100644 --- a/test/core/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol +++ b/test/core/integration/concrete/lockup-dynamic/streamed-amount-of/streamedAmountOf.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { LockupDynamic } from "src/core/types/DataTypes.sol"; - -import { LockupDynamic_Integration_Concrete_Test } from "../LockupDynamic.t.sol"; -import { StreamedAmountOf_Integration_Concrete_Test } from "../../lockup/streamed-amount-of/streamedAmountOf.t.sol"; +import { StreamedAmountOf_Integration_Concrete_Test } from "./../../lockup/streamed-amount-of/streamedAmountOf.t.sol"; +import { LockupDynamic_Integration_Concrete_Test } from "./../LockupDynamic.t.sol"; contract StreamedAmountOf_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/core/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol index ab85c71b7..007ff73f9 100644 --- a/test/core/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/core/integration/concrete/lockup-dynamic/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { LockupDynamic_Integration_Concrete_Test } from "../LockupDynamic.t.sol"; import { WithdrawableAmountOf_Integration_Concrete_Test } from - "../../lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol"; + "./../../lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol"; +import { LockupDynamic_Integration_Concrete_Test } from "./../LockupDynamic.t.sol"; contract WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-linear/LockupLinear.t.sol b/test/core/integration/concrete/lockup-linear/LockupLinear.t.sol index 6af6486f7..4c262282e 100644 --- a/test/core/integration/concrete/lockup-linear/LockupLinear.t.sol +++ b/test/core/integration/concrete/lockup-linear/LockupLinear.t.sol @@ -2,40 +2,39 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; - -import { LockupLinear_Integration_Shared_Test } from "../../shared/lockup-linear/LockupLinear.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; -import { AllowToHook_Integration_Concrete_Test } from "../lockup/allow-to-hook/allowToHook.t.sol"; -import { Burn_Integration_Concrete_Test } from "../lockup/burn/burn.t.sol"; -import { Cancel_Integration_Concrete_Test } from "../lockup/cancel/cancel.t.sol"; -import { CancelMultiple_Integration_Concrete_Test } from "../lockup/cancel-multiple/cancelMultiple.t.sol"; -import { GetAsset_Integration_Concrete_Test } from "../lockup/get-asset/getAsset.t.sol"; -import { GetDepositedAmount_Integration_Concrete_Test } from "../lockup/get-deposited-amount/getDepositedAmount.t.sol"; -import { GetEndTime_Integration_Concrete_Test } from "../lockup/get-end-time/getEndTime.t.sol"; -import { GetRefundedAmount_Integration_Concrete_Test } from "../lockup/get-refunded-amount/getRefundedAmount.t.sol"; -import { GetRecipient_Integration_Concrete_Test } from "../lockup/get-recipient/getRecipient.t.sol"; -import { GetSender_Integration_Concrete_Test } from "../lockup/get-sender/getSender.t.sol"; -import { GetStartTime_Integration_Concrete_Test } from "../lockup/get-start-time/getStartTime.t.sol"; -import { GetWithdrawnAmount_Integration_Concrete_Test } from "../lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol"; -import { IsAllowedToHook_Integration_Concrete_Test } from "../lockup/is-allowed-to-hook/isAllowedToHook.t.sol"; -import { IsCancelable_Integration_Concrete_Test } from "../lockup/is-cancelable/isCancelable.t.sol"; -import { IsCold_Integration_Concrete_Test } from "../lockup/is-cold/isCold.t.sol"; -import { IsDepleted_Integration_Concrete_Test } from "../lockup/is-depleted/isDepleted.t.sol"; -import { IsStream_Integration_Concrete_Test } from "../lockup/is-stream/isStream.t.sol"; -import { IsTransferable_Integration_Concrete_Test } from "../lockup/is-transferable/isTransferable.t.sol"; -import { IsWarm_Integration_Concrete_Test } from "../lockup/is-warm/isWarm.t.sol"; -import { RefundableAmountOf_Integration_Concrete_Test } from "../lockup/refundable-amount-of/refundableAmountOf.t.sol"; -import { Renounce_Integration_Concrete_Test } from "../lockup/renounce/renounce.t.sol"; -import { SetNFTDescriptor_Integration_Concrete_Test } from "../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; -import { StatusOf_Integration_Concrete_Test } from "../lockup/status-of/statusOf.t.sol"; -import { TransferFrom_Integration_Concrete_Test } from "../lockup/transfer-from/transferFrom.t.sol"; -import { WasCanceled_Integration_Concrete_Test } from "../lockup/was-canceled/wasCanceled.t.sol"; -import { Withdraw_Integration_Concrete_Test } from "../lockup/withdraw/withdraw.t.sol"; -import { WithdrawHooks_Integration_Concrete_Test } from "../lockup/withdraw-hooks/withdrawHooks.t.sol"; -import { WithdrawMax_Integration_Concrete_Test } from "../lockup/withdraw-max/withdrawMax.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { LockupLinear_Integration_Shared_Test } from "./../../shared/lockup-linear/LockupLinear.t.sol"; +import { AllowToHook_Integration_Concrete_Test } from "./../lockup/allow-to-hook/allowToHook.t.sol"; +import { Burn_Integration_Concrete_Test } from "./../lockup/burn/burn.t.sol"; +import { CancelMultiple_Integration_Concrete_Test } from "./../lockup/cancel-multiple/cancelMultiple.t.sol"; +import { Cancel_Integration_Concrete_Test } from "./../lockup/cancel/cancel.t.sol"; +import { GetAsset_Integration_Concrete_Test } from "./../lockup/get-asset/getAsset.t.sol"; +import { GetDepositedAmount_Integration_Concrete_Test } from "./../lockup/get-deposited-amount/getDepositedAmount.t.sol"; +import { GetEndTime_Integration_Concrete_Test } from "./../lockup/get-end-time/getEndTime.t.sol"; +import { GetRecipient_Integration_Concrete_Test } from "./../lockup/get-recipient/getRecipient.t.sol"; +import { GetRefundedAmount_Integration_Concrete_Test } from "./../lockup/get-refunded-amount/getRefundedAmount.t.sol"; +import { GetSender_Integration_Concrete_Test } from "./../lockup/get-sender/getSender.t.sol"; +import { GetStartTime_Integration_Concrete_Test } from "./../lockup/get-start-time/getStartTime.t.sol"; +import { GetWithdrawnAmount_Integration_Concrete_Test } from "./../lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol"; +import { IsAllowedToHook_Integration_Concrete_Test } from "./../lockup/is-allowed-to-hook/isAllowedToHook.t.sol"; +import { IsCancelable_Integration_Concrete_Test } from "./../lockup/is-cancelable/isCancelable.t.sol"; +import { IsCold_Integration_Concrete_Test } from "./../lockup/is-cold/isCold.t.sol"; +import { IsDepleted_Integration_Concrete_Test } from "./../lockup/is-depleted/isDepleted.t.sol"; +import { IsStream_Integration_Concrete_Test } from "./../lockup/is-stream/isStream.t.sol"; +import { IsTransferable_Integration_Concrete_Test } from "./../lockup/is-transferable/isTransferable.t.sol"; +import { IsWarm_Integration_Concrete_Test } from "./../lockup/is-warm/isWarm.t.sol"; +import { RefundableAmountOf_Integration_Concrete_Test } from "./../lockup/refundable-amount-of/refundableAmountOf.t.sol"; +import { Renounce_Integration_Concrete_Test } from "./../lockup/renounce/renounce.t.sol"; +import { SetNFTDescriptor_Integration_Concrete_Test } from "./../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; +import { StatusOf_Integration_Concrete_Test } from "./../lockup/status-of/statusOf.t.sol"; +import { TransferFrom_Integration_Concrete_Test } from "./../lockup/transfer-from/transferFrom.t.sol"; +import { WasCanceled_Integration_Concrete_Test } from "./../lockup/was-canceled/wasCanceled.t.sol"; +import { WithdrawHooks_Integration_Concrete_Test } from "./../lockup/withdraw-hooks/withdrawHooks.t.sol"; import { WithdrawMaxAndTransfer_Integration_Concrete_Test } from - "../lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol"; -import { WithdrawMultiple_Integration_Concrete_Test } from "../lockup/withdraw-multiple/withdrawMultiple.t.sol"; + "./../lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol"; +import { WithdrawMax_Integration_Concrete_Test } from "./../lockup/withdraw-max/withdrawMax.t.sol"; +import { WithdrawMultiple_Integration_Concrete_Test } from "./../lockup/withdraw-multiple/withdrawMultiple.t.sol"; +import { Withdraw_Integration_Concrete_Test } from "./../lockup/withdraw/withdraw.t.sol"; /*////////////////////////////////////////////////////////////////////////// NON-SHARED ABSTRACT TEST diff --git a/test/core/integration/concrete/lockup-linear/create-with-timestamps/createWithTimestamps.t.sol b/test/core/integration/concrete/lockup-linear/create-with-timestamps/createWithTimestamps.t.sol index 8eab57f9c..2ca968f36 100644 --- a/test/core/integration/concrete/lockup-linear/create-with-timestamps/createWithTimestamps.t.sol +++ b/test/core/integration/concrete/lockup-linear/create-with-timestamps/createWithTimestamps.t.sol @@ -1,17 +1,15 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { IERC721Errors } from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; - import { ISablierLockupLinear } from "src/core/interfaces/ISablierLockupLinear.sol"; import { Errors } from "src/core/libraries/Errors.sol"; import { Broker, Lockup, LockupLinear } from "src/core/types/DataTypes.sol"; - -import { CreateWithTimestamps_Integration_Shared_Test } from "../../../shared/lockup/createWithTimestamps.t.sol"; -import { LockupLinear_Integration_Concrete_Test } from "../LockupLinear.t.sol"; +import { CreateWithTimestamps_Integration_Shared_Test } from "./../../../shared/lockup/createWithTimestamps.t.sol"; +import { LockupLinear_Integration_Concrete_Test } from "./../LockupLinear.t.sol"; contract CreateWithTimestamps_LockupLinear_Integration_Concrete_Test is LockupLinear_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol b/test/core/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol index 728a2b50f..c2cb352ac 100644 --- a/test/core/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol +++ b/test/core/integration/concrete/lockup-linear/streamed-amount-of/streamedAmountOf.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { LockupLinear } from "src/core/types/DataTypes.sol"; - -import { LockupLinear_Integration_Concrete_Test } from "../LockupLinear.t.sol"; -import { StreamedAmountOf_Integration_Concrete_Test } from "../../lockup/streamed-amount-of/streamedAmountOf.t.sol"; +import { StreamedAmountOf_Integration_Concrete_Test } from "./../../lockup/streamed-amount-of/streamedAmountOf.t.sol"; +import { LockupLinear_Integration_Concrete_Test } from "./../LockupLinear.t.sol"; contract StreamedAmountOf_LockupLinear_Integration_Concrete_Test is LockupLinear_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/core/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol index cec2b0c44..57406f2ed 100644 --- a/test/core/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/core/integration/concrete/lockup-linear/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { LockupLinear_Integration_Concrete_Test } from "../LockupLinear.t.sol"; import { WithdrawableAmountOf_Integration_Concrete_Test } from - "../../lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol"; + "./../../lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol"; +import { LockupLinear_Integration_Concrete_Test } from "./../LockupLinear.t.sol"; contract WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test is LockupLinear_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-tranched/LockupTranched.t.sol b/test/core/integration/concrete/lockup-tranched/LockupTranched.t.sol index f90a9e62e..5e2a6c4de 100644 --- a/test/core/integration/concrete/lockup-tranched/LockupTranched.t.sol +++ b/test/core/integration/concrete/lockup-tranched/LockupTranched.t.sol @@ -2,40 +2,39 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; - -import { LockupTranched_Integration_Shared_Test } from "../../shared/lockup-tranched/LockupTranched.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; -import { AllowToHook_Integration_Concrete_Test } from "../lockup/allow-to-hook/allowToHook.t.sol"; -import { Burn_Integration_Concrete_Test } from "../lockup/burn/burn.t.sol"; -import { Cancel_Integration_Concrete_Test } from "../lockup/cancel/cancel.t.sol"; -import { CancelMultiple_Integration_Concrete_Test } from "../lockup/cancel-multiple/cancelMultiple.t.sol"; -import { GetAsset_Integration_Concrete_Test } from "../lockup/get-asset/getAsset.t.sol"; -import { GetDepositedAmount_Integration_Concrete_Test } from "../lockup/get-deposited-amount/getDepositedAmount.t.sol"; -import { GetEndTime_Integration_Concrete_Test } from "../lockup/get-end-time/getEndTime.t.sol"; -import { GetRecipient_Integration_Concrete_Test } from "../lockup/get-recipient/getRecipient.t.sol"; -import { GetRefundedAmount_Integration_Concrete_Test } from "../lockup/get-refunded-amount/getRefundedAmount.t.sol"; -import { GetSender_Integration_Concrete_Test } from "../lockup/get-sender/getSender.t.sol"; -import { GetStartTime_Integration_Concrete_Test } from "../lockup/get-start-time/getStartTime.t.sol"; -import { GetWithdrawnAmount_Integration_Concrete_Test } from "../lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol"; -import { IsAllowedToHook_Integration_Concrete_Test } from "../lockup/is-allowed-to-hook/isAllowedToHook.t.sol"; -import { IsCancelable_Integration_Concrete_Test } from "../lockup/is-cancelable/isCancelable.t.sol"; -import { IsCold_Integration_Concrete_Test } from "../lockup/is-cold/isCold.t.sol"; -import { IsDepleted_Integration_Concrete_Test } from "../lockup/is-depleted/isDepleted.t.sol"; -import { IsStream_Integration_Concrete_Test } from "../lockup/is-stream/isStream.t.sol"; -import { IsTransferable_Integration_Concrete_Test } from "../lockup/is-transferable/isTransferable.t.sol"; -import { IsWarm_Integration_Concrete_Test } from "../lockup/is-warm/isWarm.t.sol"; -import { RefundableAmountOf_Integration_Concrete_Test } from "../lockup/refundable-amount-of/refundableAmountOf.t.sol"; -import { Renounce_Integration_Concrete_Test } from "../lockup/renounce/renounce.t.sol"; -import { SetNFTDescriptor_Integration_Concrete_Test } from "../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; -import { StatusOf_Integration_Concrete_Test } from "../lockup/status-of/statusOf.t.sol"; -import { TransferFrom_Integration_Concrete_Test } from "../lockup/transfer-from/transferFrom.t.sol"; -import { WasCanceled_Integration_Concrete_Test } from "../lockup/was-canceled/wasCanceled.t.sol"; -import { Withdraw_Integration_Concrete_Test } from "../lockup/withdraw/withdraw.t.sol"; -import { WithdrawHooks_Integration_Concrete_Test } from "../lockup/withdraw-hooks/withdrawHooks.t.sol"; -import { WithdrawMax_Integration_Concrete_Test } from "../lockup/withdraw-max/withdrawMax.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { LockupTranched_Integration_Shared_Test } from "./../../shared/lockup-tranched/LockupTranched.t.sol"; +import { AllowToHook_Integration_Concrete_Test } from "./../lockup/allow-to-hook/allowToHook.t.sol"; +import { Burn_Integration_Concrete_Test } from "./../lockup/burn/burn.t.sol"; +import { CancelMultiple_Integration_Concrete_Test } from "./../lockup/cancel-multiple/cancelMultiple.t.sol"; +import { Cancel_Integration_Concrete_Test } from "./../lockup/cancel/cancel.t.sol"; +import { GetAsset_Integration_Concrete_Test } from "./../lockup/get-asset/getAsset.t.sol"; +import { GetDepositedAmount_Integration_Concrete_Test } from "./../lockup/get-deposited-amount/getDepositedAmount.t.sol"; +import { GetEndTime_Integration_Concrete_Test } from "./../lockup/get-end-time/getEndTime.t.sol"; +import { GetRecipient_Integration_Concrete_Test } from "./../lockup/get-recipient/getRecipient.t.sol"; +import { GetRefundedAmount_Integration_Concrete_Test } from "./../lockup/get-refunded-amount/getRefundedAmount.t.sol"; +import { GetSender_Integration_Concrete_Test } from "./../lockup/get-sender/getSender.t.sol"; +import { GetStartTime_Integration_Concrete_Test } from "./../lockup/get-start-time/getStartTime.t.sol"; +import { GetWithdrawnAmount_Integration_Concrete_Test } from "./../lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol"; +import { IsAllowedToHook_Integration_Concrete_Test } from "./../lockup/is-allowed-to-hook/isAllowedToHook.t.sol"; +import { IsCancelable_Integration_Concrete_Test } from "./../lockup/is-cancelable/isCancelable.t.sol"; +import { IsCold_Integration_Concrete_Test } from "./../lockup/is-cold/isCold.t.sol"; +import { IsDepleted_Integration_Concrete_Test } from "./../lockup/is-depleted/isDepleted.t.sol"; +import { IsStream_Integration_Concrete_Test } from "./../lockup/is-stream/isStream.t.sol"; +import { IsTransferable_Integration_Concrete_Test } from "./../lockup/is-transferable/isTransferable.t.sol"; +import { IsWarm_Integration_Concrete_Test } from "./../lockup/is-warm/isWarm.t.sol"; +import { RefundableAmountOf_Integration_Concrete_Test } from "./../lockup/refundable-amount-of/refundableAmountOf.t.sol"; +import { Renounce_Integration_Concrete_Test } from "./../lockup/renounce/renounce.t.sol"; +import { SetNFTDescriptor_Integration_Concrete_Test } from "./../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; +import { StatusOf_Integration_Concrete_Test } from "./../lockup/status-of/statusOf.t.sol"; +import { TransferFrom_Integration_Concrete_Test } from "./../lockup/transfer-from/transferFrom.t.sol"; +import { WasCanceled_Integration_Concrete_Test } from "./../lockup/was-canceled/wasCanceled.t.sol"; +import { WithdrawHooks_Integration_Concrete_Test } from "./../lockup/withdraw-hooks/withdrawHooks.t.sol"; import { WithdrawMaxAndTransfer_Integration_Concrete_Test } from - "../lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol"; -import { WithdrawMultiple_Integration_Concrete_Test } from "../lockup/withdraw-multiple/withdrawMultiple.t.sol"; + "./../lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol"; +import { WithdrawMax_Integration_Concrete_Test } from "./../lockup/withdraw-max/withdrawMax.t.sol"; +import { WithdrawMultiple_Integration_Concrete_Test } from "./../lockup/withdraw-multiple/withdrawMultiple.t.sol"; +import { Withdraw_Integration_Concrete_Test } from "./../lockup/withdraw/withdraw.t.sol"; /*////////////////////////////////////////////////////////////////////////// NON-SHARED ABSTRACT TEST diff --git a/test/core/integration/concrete/lockup-tranched/create-with-timestamps/createWithTimestamps.t.sol b/test/core/integration/concrete/lockup-tranched/create-with-timestamps/createWithTimestamps.t.sol index 9ecc0ecf4..7ee6a65fd 100644 --- a/test/core/integration/concrete/lockup-tranched/create-with-timestamps/createWithTimestamps.t.sol +++ b/test/core/integration/concrete/lockup-tranched/create-with-timestamps/createWithTimestamps.t.sol @@ -1,18 +1,16 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { IERC721Errors } from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { stdError } from "forge-std/src/StdError.sol"; - import { ISablierLockupTranched } from "src/core/interfaces/ISablierLockupTranched.sol"; import { Errors } from "src/core/libraries/Errors.sol"; import { Broker, Lockup, LockupTranched } from "src/core/types/DataTypes.sol"; - -import { CreateWithTimestamps_Integration_Shared_Test } from "../../../shared/lockup/createWithTimestamps.t.sol"; -import { LockupTranched_Integration_Concrete_Test } from "../LockupTranched.t.sol"; +import { CreateWithTimestamps_Integration_Shared_Test } from "./../../../shared/lockup/createWithTimestamps.t.sol"; +import { LockupTranched_Integration_Concrete_Test } from "./../LockupTranched.t.sol"; contract CreateWithTimestamps_LockupTranched_Integration_Concrete_Test is LockupTranched_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol b/test/core/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol index b62cc9756..612dcd79d 100644 --- a/test/core/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol +++ b/test/core/integration/concrete/lockup-tranched/streamed-amount-of/streamedAmountOf.t.sol @@ -1,7 +1,7 @@ pragma solidity >=0.8.22 <0.9.0; -import { LockupTranched_Integration_Concrete_Test } from "../LockupTranched.t.sol"; -import { StreamedAmountOf_Integration_Concrete_Test } from "../../lockup/streamed-amount-of/streamedAmountOf.t.sol"; +import { StreamedAmountOf_Integration_Concrete_Test } from "./../../lockup/streamed-amount-of/streamedAmountOf.t.sol"; +import { LockupTranched_Integration_Concrete_Test } from "./../LockupTranched.t.sol"; contract StreamedAmountOf_LockupTranched_Integration_Concrete_Test is LockupTranched_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/core/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol index 430a69769..7ac71f2d7 100644 --- a/test/core/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/core/integration/concrete/lockup-tranched/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { LockupTranched_Integration_Concrete_Test } from "../LockupTranched.t.sol"; import { WithdrawableAmountOf_Integration_Concrete_Test } from - "../../lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol"; + "./../../lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol"; +import { LockupTranched_Integration_Concrete_Test } from "./../LockupTranched.t.sol"; contract WithdrawableAmountOf_LockupTranched_Integration_Concrete_Test is LockupTranched_Integration_Concrete_Test, diff --git a/test/core/integration/concrete/lockup/allow-to-hook/allowToHook.t.sol b/test/core/integration/concrete/lockup/allow-to-hook/allowToHook.t.sol index 49dc707d2..6b9524e67 100644 --- a/test/core/integration/concrete/lockup/allow-to-hook/allowToHook.t.sol +++ b/test/core/integration/concrete/lockup/allow-to-hook/allowToHook.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract AllowToHook_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/burn/burn.t.sol b/test/core/integration/concrete/lockup/burn/burn.t.sol index 18bf3cd5c..e3d411ca6 100644 --- a/test/core/integration/concrete/lockup/burn/burn.t.sol +++ b/test/core/integration/concrete/lockup/burn/burn.t.sol @@ -2,12 +2,10 @@ pragma solidity >=0.8.22 <0.9.0; import { IERC721Errors } from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol"; - import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal streamId; diff --git a/test/core/integration/concrete/lockup/cancel/cancel.t.sol b/test/core/integration/concrete/lockup/cancel/cancel.t.sol index 7efec10d6..862be453f 100644 --- a/test/core/integration/concrete/lockup/cancel/cancel.t.sol +++ b/test/core/integration/concrete/lockup/cancel/cancel.t.sol @@ -4,11 +4,9 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; import { ISablierLockupRecipient } from "src/core/interfaces/ISablierLockupRecipient.sol"; import { Errors } from "src/core/libraries/Errors.sol"; - import { Lockup } from "src/core/types/DataTypes.sol"; - -import { Cancel_Integration_Shared_Test } from "../../../shared/lockup/cancel.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Cancel_Integration_Shared_Test } from "./../../../shared/lockup/cancel.t.sol"; abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Cancel_Integration_Shared_Test) { diff --git a/test/core/integration/concrete/lockup/get-asset/getAsset.t.sol b/test/core/integration/concrete/lockup/get-asset/getAsset.t.sol index ddc76f541..b8d35210e 100644 --- a/test/core/integration/concrete/lockup/get-asset/getAsset.t.sol +++ b/test/core/integration/concrete/lockup/get-asset/getAsset.t.sol @@ -2,11 +2,9 @@ pragma solidity >=0.8.22 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract GetAsset_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { } diff --git a/test/core/integration/concrete/lockup/get-deposited-amount/getDepositedAmount.t.sol b/test/core/integration/concrete/lockup/get-deposited-amount/getDepositedAmount.t.sol index afc990b0f..ea591e50b 100644 --- a/test/core/integration/concrete/lockup/get-deposited-amount/getDepositedAmount.t.sol +++ b/test/core/integration/concrete/lockup/get-deposited-amount/getDepositedAmount.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract GetDepositedAmount_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { } diff --git a/test/core/integration/concrete/lockup/get-end-time/getEndTime.t.sol b/test/core/integration/concrete/lockup/get-end-time/getEndTime.t.sol index 7b478f3ea..79f82407e 100644 --- a/test/core/integration/concrete/lockup/get-end-time/getEndTime.t.sol +++ b/test/core/integration/concrete/lockup/get-end-time/getEndTime.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract GetEndTime_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { } diff --git a/test/core/integration/concrete/lockup/get-recipient/getRecipient.t.sol b/test/core/integration/concrete/lockup/get-recipient/getRecipient.t.sol index d1783f4b5..defab33ae 100644 --- a/test/core/integration/concrete/lockup/get-recipient/getRecipient.t.sol +++ b/test/core/integration/concrete/lockup/get-recipient/getRecipient.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { IERC721Errors } from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract GetRecipient_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/get-refunded-amount/getRefundedAmount.t.sol b/test/core/integration/concrete/lockup/get-refunded-amount/getRefundedAmount.t.sol index 8c6528ba0..b8579fc56 100644 --- a/test/core/integration/concrete/lockup/get-refunded-amount/getRefundedAmount.t.sol +++ b/test/core/integration/concrete/lockup/get-refunded-amount/getRefundedAmount.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract GetRefundedAmount_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/get-sender/getSender.t.sol b/test/core/integration/concrete/lockup/get-sender/getSender.t.sol index 9a1aa2ef7..4bc857f5a 100644 --- a/test/core/integration/concrete/lockup/get-sender/getSender.t.sol +++ b/test/core/integration/concrete/lockup/get-sender/getSender.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract GetSender_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { } diff --git a/test/core/integration/concrete/lockup/get-start-time/getStartTime.t.sol b/test/core/integration/concrete/lockup/get-start-time/getStartTime.t.sol index 106fe4658..85bea7705 100644 --- a/test/core/integration/concrete/lockup/get-start-time/getStartTime.t.sol +++ b/test/core/integration/concrete/lockup/get-start-time/getStartTime.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract GetStartTime_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { } diff --git a/test/core/integration/concrete/lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol b/test/core/integration/concrete/lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol index ebfa734f2..f7a2c9661 100644 --- a/test/core/integration/concrete/lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol +++ b/test/core/integration/concrete/lockup/get-withdrawn-amount/getWithdrawnAmount.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { GetWithdrawnAmount_Integration_Shared_Test } from "../../../shared/lockup/getWithdrawnAmount.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { GetWithdrawnAmount_Integration_Shared_Test } from "./../../../shared/lockup/getWithdrawnAmount.t.sol"; abstract contract GetWithdrawnAmount_Integration_Concrete_Test is Integration_Test, diff --git a/test/core/integration/concrete/lockup/is-allowed-to-hook/isAllowedToHook.t.sol b/test/core/integration/concrete/lockup/is-allowed-to-hook/isAllowedToHook.t.sol index be9b7ca91..d19e7ad0b 100644 --- a/test/core/integration/concrete/lockup/is-allowed-to-hook/isAllowedToHook.t.sol +++ b/test/core/integration/concrete/lockup/is-allowed-to-hook/isAllowedToHook.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract IsAllowedToHook_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/is-cancelable/isCancelable.t.sol b/test/core/integration/concrete/lockup/is-cancelable/isCancelable.t.sol index 43f2d308e..af78de10a 100644 --- a/test/core/integration/concrete/lockup/is-cancelable/isCancelable.t.sol +++ b/test/core/integration/concrete/lockup/is-cancelable/isCancelable.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract IsCancelable_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/is-cold/isCold.t.sol b/test/core/integration/concrete/lockup/is-cold/isCold.t.sol index 4408948a0..46d5fbd30 100644 --- a/test/core/integration/concrete/lockup/is-cold/isCold.t.sol +++ b/test/core/integration/concrete/lockup/is-cold/isCold.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract IsCold_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/is-depleted/isDepleted.t.sol b/test/core/integration/concrete/lockup/is-depleted/isDepleted.t.sol index 034b40a3a..5cc9dc715 100644 --- a/test/core/integration/concrete/lockup/is-depleted/isDepleted.t.sol +++ b/test/core/integration/concrete/lockup/is-depleted/isDepleted.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract IsDepleted_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/is-stream/isStream.t.sol b/test/core/integration/concrete/lockup/is-stream/isStream.t.sol index 991e1e5a7..ef64d6459 100644 --- a/test/core/integration/concrete/lockup/is-stream/isStream.t.sol +++ b/test/core/integration/concrete/lockup/is-stream/isStream.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract IsStream_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/is-transferable/isTransferable.t.sol b/test/core/integration/concrete/lockup/is-transferable/isTransferable.t.sol index b725080a4..d1d8b23ab 100644 --- a/test/core/integration/concrete/lockup/is-transferable/isTransferable.t.sol +++ b/test/core/integration/concrete/lockup/is-transferable/isTransferable.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract IsTransferable_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/is-warm/isWarm.t.sol b/test/core/integration/concrete/lockup/is-warm/isWarm.t.sol index c33b396b5..31942a91f 100644 --- a/test/core/integration/concrete/lockup/is-warm/isWarm.t.sol +++ b/test/core/integration/concrete/lockup/is-warm/isWarm.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract IsWarm_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/refundable-amount-of/refundableAmountOf.t.sol b/test/core/integration/concrete/lockup/refundable-amount-of/refundableAmountOf.t.sol index 586303ab0..bac17566f 100644 --- a/test/core/integration/concrete/lockup/refundable-amount-of/refundableAmountOf.t.sol +++ b/test/core/integration/concrete/lockup/refundable-amount-of/refundableAmountOf.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract RefundableAmountOf_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/renounce/renounce.t.sol b/test/core/integration/concrete/lockup/renounce/renounce.t.sol index 8d9b7bbc9..af963a548 100644 --- a/test/core/integration/concrete/lockup/renounce/renounce.t.sol +++ b/test/core/integration/concrete/lockup/renounce/renounce.t.sol @@ -3,9 +3,8 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract Renounce_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/set-nft-descriptor/setNFTDescriptor.t.sol b/test/core/integration/concrete/lockup/set-nft-descriptor/setNFTDescriptor.t.sol index 567ebe6bb..dfbb0726a 100644 --- a/test/core/integration/concrete/lockup/set-nft-descriptor/setNFTDescriptor.t.sol +++ b/test/core/integration/concrete/lockup/set-nft-descriptor/setNFTDescriptor.t.sol @@ -4,9 +4,8 @@ pragma solidity >=0.8.22 <0.9.0; import { ILockupNFTDescriptor } from "src/core/interfaces/ILockupNFTDescriptor.sol"; import { Errors } from "src/core/libraries/Errors.sol"; import { LockupNFTDescriptor } from "src/core/LockupNFTDescriptor.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract SetNFTDescriptor_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/status-of/statusOf.t.sol b/test/core/integration/concrete/lockup/status-of/statusOf.t.sol index 295f4ef34..43a40387c 100644 --- a/test/core/integration/concrete/lockup/status-of/statusOf.t.sol +++ b/test/core/integration/concrete/lockup/status-of/statusOf.t.sol @@ -3,9 +3,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract StatusOf_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/streamed-amount-of/streamedAmountOf.t.sol b/test/core/integration/concrete/lockup/streamed-amount-of/streamedAmountOf.t.sol index df2836aa7..2feb500e5 100644 --- a/test/core/integration/concrete/lockup/streamed-amount-of/streamedAmountOf.t.sol +++ b/test/core/integration/concrete/lockup/streamed-amount-of/streamedAmountOf.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { StreamedAmountOf_Integration_Shared_Test } from "../../../shared/lockup/streamedAmountOf.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { StreamedAmountOf_Integration_Shared_Test } from "./../../../shared/lockup/streamedAmountOf.t.sol"; abstract contract StreamedAmountOf_Integration_Concrete_Test is Integration_Test, diff --git a/test/core/integration/concrete/lockup/transfer-from/transferFrom.t.sol b/test/core/integration/concrete/lockup/transfer-from/transferFrom.t.sol index 4b382d53d..b9777db88 100644 --- a/test/core/integration/concrete/lockup/transfer-from/transferFrom.t.sol +++ b/test/core/integration/concrete/lockup/transfer-from/transferFrom.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract TransferFrom_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { diff --git a/test/core/integration/concrete/lockup/was-canceled/wasCanceled.t.sol b/test/core/integration/concrete/lockup/was-canceled/wasCanceled.t.sol index 6b91f6e21..5f6805be6 100644 --- a/test/core/integration/concrete/lockup/was-canceled/wasCanceled.t.sol +++ b/test/core/integration/concrete/lockup/was-canceled/wasCanceled.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../../shared/lockup/Lockup.t.sol"; abstract contract WasCanceled_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol b/test/core/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol index 758a5238b..6274f9202 100644 --- a/test/core/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol +++ b/test/core/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol @@ -4,9 +4,8 @@ pragma solidity >=0.8.22 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; import { Errors } from "src/core/libraries/Errors.sol"; - -import { WithdrawMaxAndTransfer_Integration_Shared_Test } from "../../../shared/lockup/withdrawMaxAndTransfer.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { WithdrawMaxAndTransfer_Integration_Shared_Test } from "./../../../shared/lockup/withdrawMaxAndTransfer.t.sol"; abstract contract WithdrawMaxAndTransfer_Integration_Concrete_Test is Integration_Test, diff --git a/test/core/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol b/test/core/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol index 32d390f23..464561e6f 100644 --- a/test/core/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol +++ b/test/core/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { WithdrawMax_Integration_Shared_Test } from "../../../shared/lockup/withdrawMax.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { WithdrawMax_Integration_Shared_Test } from "./../../../shared/lockup/withdrawMax.t.sol"; abstract contract WithdrawMax_Integration_Concrete_Test is Integration_Test, WithdrawMax_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, WithdrawMax_Integration_Shared_Test) { diff --git a/test/core/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol b/test/core/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol index 3cd602324..afbfc76c6 100644 --- a/test/core/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol +++ b/test/core/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol @@ -2,13 +2,11 @@ pragma solidity >=0.8.22 <0.9.0; import { Solarray } from "solarray/src/Solarray.sol"; - import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; import { Errors } from "src/core/libraries/Errors.sol"; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { WithdrawMultiple_Integration_Shared_Test } from "../../../shared/lockup/withdrawMultiple.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { WithdrawMultiple_Integration_Shared_Test } from "./../../../shared/lockup/withdrawMultiple.t.sol"; abstract contract WithdrawMultiple_Integration_Concrete_Test is Integration_Test, diff --git a/test/core/integration/concrete/lockup/withdraw/withdraw.t.sol b/test/core/integration/concrete/lockup/withdraw/withdraw.t.sol index d05836a4f..16d5755ea 100644 --- a/test/core/integration/concrete/lockup/withdraw/withdraw.t.sol +++ b/test/core/integration/concrete/lockup/withdraw/withdraw.t.sol @@ -4,11 +4,9 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; import { ISablierLockupRecipient } from "src/core/interfaces/ISablierLockupRecipient.sol"; import { Errors } from "src/core/libraries/Errors.sol"; - import { Lockup } from "src/core/types/DataTypes.sol"; - -import { Withdraw_Integration_Shared_Test } from "../../../shared/lockup/withdraw.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { Withdraw_Integration_Shared_Test } from "./../../../shared/lockup/withdraw.t.sol"; abstract contract Withdraw_Integration_Concrete_Test is Integration_Test, Withdraw_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Withdraw_Integration_Shared_Test) { diff --git a/test/core/integration/concrete/lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/core/integration/concrete/lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol index 8379fbfdf..74664c165 100644 --- a/test/core/integration/concrete/lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/core/integration/concrete/lockup/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Errors } from "src/core/libraries/Errors.sol"; - -import { WithdrawableAmountOf_Integration_Shared_Test } from "../../../shared/lockup/withdrawableAmountOf.t.sol"; -import { Integration_Test } from "../../../Integration.t.sol"; +import { Integration_Test } from "./../../../Integration.t.sol"; +import { WithdrawableAmountOf_Integration_Shared_Test } from "./../../../shared/lockup/withdrawableAmountOf.t.sol"; abstract contract WithdrawableAmountOf_Integration_Concrete_Test is Integration_Test, diff --git a/test/core/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol b/test/core/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol index 1848e57a7..e9fef6497 100644 --- a/test/core/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol +++ b/test/core/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 { ERC20Mock } from "test/mocks/erc20/ERC20Mock.sol"; import { ERC20Bytes32 } from "test/mocks/erc20/ERC20Bytes32.sol"; -import { NFTDescriptor_Integration_Shared_Test } from "../../../shared/nft-descriptor/NFTDescriptor.t.sol"; +import { ERC20Mock } from "test/mocks/erc20/ERC20Mock.sol"; +import { NFTDescriptor_Integration_Shared_Test } from "./../../../shared/nft-descriptor/NFTDescriptor.t.sol"; contract SafeAssetSymbol_Integration_Concrete_Test is NFTDescriptor_Integration_Shared_Test { function test_WhenAssetNotContract() external view { diff --git a/test/core/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol b/test/core/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol index 12aac9929..461eac483 100644 --- a/test/core/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol +++ b/test/core/integration/fuzz/lockup-dynamic/LockupDynamic.t.sol @@ -2,16 +2,15 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; - -import { LockupDynamic_Integration_Shared_Test } from "../../shared/lockup-dynamic/LockupDynamic.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; -import { Cancel_Integration_Fuzz_Test } from "../lockup/cancel.t.sol"; -import { CancelMultiple_Integration_Fuzz_Test } from "../lockup/cancelMultiple.t.sol"; -import { GetWithdrawnAmount_Integration_Fuzz_Test } from "../lockup/getWithdrawnAmount.t.sol"; -import { RefundableAmountOf_Integration_Fuzz_Test } from "../lockup/refundableAmountOf.t.sol"; -import { WithdrawMax_Integration_Fuzz_Test } from "../lockup/withdrawMax.t.sol"; -import { WithdrawMaxAndTransfer_Integration_Fuzz_Test } from "../lockup/withdrawMaxAndTransfer.t.sol"; -import { WithdrawMultiple_Integration_Fuzz_Test } from "../lockup/withdrawMultiple.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { LockupDynamic_Integration_Shared_Test } from "./../../shared/lockup-dynamic/LockupDynamic.t.sol"; +import { Cancel_Integration_Fuzz_Test } from "./../lockup/cancel.t.sol"; +import { CancelMultiple_Integration_Fuzz_Test } from "./../lockup/cancelMultiple.t.sol"; +import { GetWithdrawnAmount_Integration_Fuzz_Test } from "./../lockup/getWithdrawnAmount.t.sol"; +import { RefundableAmountOf_Integration_Fuzz_Test } from "./../lockup/refundableAmountOf.t.sol"; +import { WithdrawMax_Integration_Fuzz_Test } from "./../lockup/withdrawMax.t.sol"; +import { WithdrawMaxAndTransfer_Integration_Fuzz_Test } from "./../lockup/withdrawMaxAndTransfer.t.sol"; +import { WithdrawMultiple_Integration_Fuzz_Test } from "./../lockup/withdrawMultiple.t.sol"; /*////////////////////////////////////////////////////////////////////////// NON-SHARED ABSTRACT TEST diff --git a/test/core/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol b/test/core/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol index c8d991a38..163994a7e 100644 --- a/test/core/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol +++ b/test/core/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { LockupDynamic } from "src/core/types/DataTypes.sol"; - +import { WithdrawableAmountOf_Integration_Shared_Test } from "./../../shared/lockup/withdrawableAmountOf.t.sol"; import { LockupDynamic_Integration_Fuzz_Test } from "./LockupDynamic.t.sol"; -import { WithdrawableAmountOf_Integration_Shared_Test } from "../../shared/lockup/withdrawableAmountOf.t.sol"; contract WithdrawableAmountOf_LockupDynamic_Integration_Fuzz_Test is LockupDynamic_Integration_Fuzz_Test, diff --git a/test/core/integration/fuzz/lockup-linear/LockupLinear.t.sol b/test/core/integration/fuzz/lockup-linear/LockupLinear.t.sol index 9590d9f2a..62555d734 100644 --- a/test/core/integration/fuzz/lockup-linear/LockupLinear.t.sol +++ b/test/core/integration/fuzz/lockup-linear/LockupLinear.t.sol @@ -2,17 +2,16 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; - -import { LockupLinear_Integration_Shared_Test } from "../../shared/lockup-linear/LockupLinear.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; -import { Cancel_Integration_Fuzz_Test } from "../lockup/cancel.t.sol"; -import { CancelMultiple_Integration_Fuzz_Test } from "../lockup/cancelMultiple.t.sol"; -import { GetWithdrawnAmount_Integration_Fuzz_Test } from "../lockup/getWithdrawnAmount.t.sol"; -import { RefundableAmountOf_Integration_Fuzz_Test } from "../lockup/refundableAmountOf.t.sol"; -import { Withdraw_Integration_Fuzz_Test } from "../lockup/withdraw.t.sol"; -import { WithdrawMax_Integration_Fuzz_Test } from "../lockup/withdrawMax.t.sol"; -import { WithdrawMaxAndTransfer_Integration_Fuzz_Test } from "../lockup/withdrawMaxAndTransfer.t.sol"; -import { WithdrawMultiple_Integration_Fuzz_Test } from "../lockup/withdrawMultiple.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { LockupLinear_Integration_Shared_Test } from "./../../shared/lockup-linear/LockupLinear.t.sol"; +import { Cancel_Integration_Fuzz_Test } from "./../lockup/cancel.t.sol"; +import { CancelMultiple_Integration_Fuzz_Test } from "./../lockup/cancelMultiple.t.sol"; +import { GetWithdrawnAmount_Integration_Fuzz_Test } from "./../lockup/getWithdrawnAmount.t.sol"; +import { RefundableAmountOf_Integration_Fuzz_Test } from "./../lockup/refundableAmountOf.t.sol"; +import { Withdraw_Integration_Fuzz_Test } from "./../lockup/withdraw.t.sol"; +import { WithdrawMax_Integration_Fuzz_Test } from "./../lockup/withdrawMax.t.sol"; +import { WithdrawMaxAndTransfer_Integration_Fuzz_Test } from "./../lockup/withdrawMaxAndTransfer.t.sol"; +import { WithdrawMultiple_Integration_Fuzz_Test } from "./../lockup/withdrawMultiple.t.sol"; /*////////////////////////////////////////////////////////////////////////// NON-SHARED ABSTRACT TEST diff --git a/test/core/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol b/test/core/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol index b1f93e60d..5a7f80e12 100644 --- a/test/core/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol +++ b/test/core/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { LockupLinear } from "src/core/types/DataTypes.sol"; - +import { WithdrawableAmountOf_Integration_Shared_Test } from "./../../shared/lockup/withdrawableAmountOf.t.sol"; import { LockupLinear_Integration_Fuzz_Test } from "./LockupLinear.t.sol"; -import { WithdrawableAmountOf_Integration_Shared_Test } from "../../shared/lockup/withdrawableAmountOf.t.sol"; contract WithdrawableAmountOf_LockupLinear_Integration_Fuzz_Test is LockupLinear_Integration_Fuzz_Test, diff --git a/test/core/integration/fuzz/lockup-tranched/LockupTranched.t.sol b/test/core/integration/fuzz/lockup-tranched/LockupTranched.t.sol index d1a7e7205..14e97867c 100644 --- a/test/core/integration/fuzz/lockup-tranched/LockupTranched.t.sol +++ b/test/core/integration/fuzz/lockup-tranched/LockupTranched.t.sol @@ -2,16 +2,15 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; - -import { LockupTranched_Integration_Shared_Test } from "../../shared/lockup-tranched/LockupTranched.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; -import { Cancel_Integration_Fuzz_Test } from "../lockup/cancel.t.sol"; -import { CancelMultiple_Integration_Fuzz_Test } from "../lockup/cancelMultiple.t.sol"; -import { GetWithdrawnAmount_Integration_Fuzz_Test } from "../lockup/getWithdrawnAmount.t.sol"; -import { RefundableAmountOf_Integration_Fuzz_Test } from "../lockup/refundableAmountOf.t.sol"; -import { WithdrawMax_Integration_Fuzz_Test } from "../lockup/withdrawMax.t.sol"; -import { WithdrawMaxAndTransfer_Integration_Fuzz_Test } from "../lockup/withdrawMaxAndTransfer.t.sol"; -import { WithdrawMultiple_Integration_Fuzz_Test } from "../lockup/withdrawMultiple.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { LockupTranched_Integration_Shared_Test } from "./../../shared/lockup-tranched/LockupTranched.t.sol"; +import { Cancel_Integration_Fuzz_Test } from "./../lockup/cancel.t.sol"; +import { CancelMultiple_Integration_Fuzz_Test } from "./../lockup/cancelMultiple.t.sol"; +import { GetWithdrawnAmount_Integration_Fuzz_Test } from "./../lockup/getWithdrawnAmount.t.sol"; +import { RefundableAmountOf_Integration_Fuzz_Test } from "./../lockup/refundableAmountOf.t.sol"; +import { WithdrawMax_Integration_Fuzz_Test } from "./../lockup/withdrawMax.t.sol"; +import { WithdrawMaxAndTransfer_Integration_Fuzz_Test } from "./../lockup/withdrawMaxAndTransfer.t.sol"; +import { WithdrawMultiple_Integration_Fuzz_Test } from "./../lockup/withdrawMultiple.t.sol"; /*////////////////////////////////////////////////////////////////////////// NON-SHARED ABSTRACT TEST diff --git a/test/core/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol b/test/core/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol index 73b168bdc..bed0c059d 100644 --- a/test/core/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol +++ b/test/core/integration/fuzz/lockup-tranched/withdrawableAmountOf.t.sol @@ -2,11 +2,9 @@ pragma solidity >=0.8.22 <0.9.0; import { ZERO } from "@prb/math/src/UD60x18.sol"; - import { Broker, LockupTranched } from "src/core/types/DataTypes.sol"; - +import { WithdrawableAmountOf_Integration_Shared_Test } from "./../../shared/lockup/withdrawableAmountOf.t.sol"; import { LockupTranched_Integration_Fuzz_Test } from "./LockupTranched.t.sol"; -import { WithdrawableAmountOf_Integration_Shared_Test } from "../../shared/lockup/withdrawableAmountOf.t.sol"; contract WithdrawableAmountOf_LockupTranched_Integration_Fuzz_Test is LockupTranched_Integration_Fuzz_Test, diff --git a/test/core/integration/fuzz/lockup/cancel.t.sol b/test/core/integration/fuzz/lockup/cancel.t.sol index 1c2efa0ba..715d9ae23 100644 --- a/test/core/integration/fuzz/lockup/cancel.t.sol +++ b/test/core/integration/fuzz/lockup/cancel.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { Cancel_Integration_Shared_Test } from "../../shared/lockup/cancel.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { Cancel_Integration_Shared_Test } from "./../../shared/lockup/cancel.t.sol"; abstract contract Cancel_Integration_Fuzz_Test is Integration_Test, Cancel_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Cancel_Integration_Shared_Test) { diff --git a/test/core/integration/fuzz/lockup/getWithdrawnAmount.t.sol b/test/core/integration/fuzz/lockup/getWithdrawnAmount.t.sol index f358d6ca0..80534faa5 100644 --- a/test/core/integration/fuzz/lockup/getWithdrawnAmount.t.sol +++ b/test/core/integration/fuzz/lockup/getWithdrawnAmount.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { GetWithdrawnAmount_Integration_Shared_Test } from "../../shared/lockup/getWithdrawnAmount.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { GetWithdrawnAmount_Integration_Shared_Test } from "./../../shared/lockup/getWithdrawnAmount.t.sol"; abstract contract GetWithdrawnAmount_Integration_Fuzz_Test is Integration_Test, diff --git a/test/core/integration/fuzz/lockup/refundableAmountOf.t.sol b/test/core/integration/fuzz/lockup/refundableAmountOf.t.sol index 013548a9d..8cc7c622a 100644 --- a/test/core/integration/fuzz/lockup/refundableAmountOf.t.sol +++ b/test/core/integration/fuzz/lockup/refundableAmountOf.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Lockup_Integration_Shared_Test } from "../../shared/lockup/Lockup.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { Lockup_Integration_Shared_Test } from "./../../shared/lockup/Lockup.t.sol"; abstract contract RefundableAmountOf_Integration_Fuzz_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal defaultStreamId; diff --git a/test/core/integration/fuzz/lockup/withdraw.t.sol b/test/core/integration/fuzz/lockup/withdraw.t.sol index 1b38fdd88..d831d2475 100644 --- a/test/core/integration/fuzz/lockup/withdraw.t.sol +++ b/test/core/integration/fuzz/lockup/withdraw.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { Withdraw_Integration_Shared_Test } from "../../shared/lockup/withdraw.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { Withdraw_Integration_Shared_Test } from "./../../shared/lockup/withdraw.t.sol"; abstract contract Withdraw_Integration_Fuzz_Test is Integration_Test, Withdraw_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, Withdraw_Integration_Shared_Test) { diff --git a/test/core/integration/fuzz/lockup/withdrawMax.t.sol b/test/core/integration/fuzz/lockup/withdrawMax.t.sol index 3a21ab7f9..cd7bd6e42 100644 --- a/test/core/integration/fuzz/lockup/withdrawMax.t.sol +++ b/test/core/integration/fuzz/lockup/withdrawMax.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { WithdrawMax_Integration_Shared_Test } from "../../shared/lockup/withdrawMax.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { WithdrawMax_Integration_Shared_Test } from "./../../shared/lockup/withdrawMax.t.sol"; abstract contract WithdrawMax_Integration_Fuzz_Test is Integration_Test, WithdrawMax_Integration_Shared_Test { function setUp() public virtual override(Integration_Test, WithdrawMax_Integration_Shared_Test) { diff --git a/test/core/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol b/test/core/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol index 829cfd447..8b8f5be30 100644 --- a/test/core/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol +++ b/test/core/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { WithdrawMaxAndTransfer_Integration_Shared_Test } from "../../shared/lockup/withdrawMaxAndTransfer.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { WithdrawMaxAndTransfer_Integration_Shared_Test } from "./../../shared/lockup/withdrawMaxAndTransfer.t.sol"; abstract contract WithdrawMaxAndTransfer_Integration_Fuzz_Test is Integration_Test, diff --git a/test/core/integration/fuzz/lockup/withdrawMultiple.t.sol b/test/core/integration/fuzz/lockup/withdrawMultiple.t.sol index fddacb099..7e1b68054 100644 --- a/test/core/integration/fuzz/lockup/withdrawMultiple.t.sol +++ b/test/core/integration/fuzz/lockup/withdrawMultiple.t.sol @@ -2,11 +2,9 @@ pragma solidity >=0.8.22 <0.9.0; import { Solarray } from "solarray/src/Solarray.sol"; - import { Lockup } from "src/core/types/DataTypes.sol"; - -import { WithdrawMultiple_Integration_Shared_Test } from "../../shared/lockup/withdrawMultiple.t.sol"; -import { Integration_Test } from "../../Integration.t.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; +import { WithdrawMultiple_Integration_Shared_Test } from "./../../shared/lockup/withdrawMultiple.t.sol"; abstract contract WithdrawMultiple_Integration_Fuzz_Test is Integration_Test, diff --git a/test/core/integration/shared/nft-descriptor/NFTDescriptor.t.sol b/test/core/integration/shared/nft-descriptor/NFTDescriptor.t.sol index 2af3595c3..afa63386d 100644 --- a/test/core/integration/shared/nft-descriptor/NFTDescriptor.t.sol +++ b/test/core/integration/shared/nft-descriptor/NFTDescriptor.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Integration_Test } from "../../Integration.t.sol"; import { NFTDescriptorMock } from "test/mocks/NFTDescriptorMock.sol"; +import { Integration_Test } from "./../../Integration.t.sol"; abstract contract NFTDescriptor_Integration_Shared_Test is Integration_Test { NFTDescriptorMock internal nftDescriptorMock; diff --git a/test/core/invariant/Lockup.t.sol b/test/core/invariant/Lockup.t.sol index 54ae5801f..2eeaa9a54 100644 --- a/test/core/invariant/Lockup.t.sol +++ b/test/core/invariant/Lockup.t.sol @@ -3,9 +3,8 @@ pragma solidity >=0.8.22 <0.9.0; import { ISablierLockup } from "src/core/interfaces/ISablierLockup.sol"; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { Invariant_Test } from "./Invariant.t.sol"; import { LockupHandler } from "./handlers/LockupHandler.sol"; +import { Invariant_Test } from "./Invariant.t.sol"; import { LockupStore } from "./stores/LockupStore.sol"; /// @notice Common invariant test logic needed across contracts that inherit from {SablierLockup}. diff --git a/test/core/invariant/LockupDynamic.t.sol b/test/core/invariant/LockupDynamic.t.sol index fdfe4445e..efcd0a517 100644 --- a/test/core/invariant/LockupDynamic.t.sol +++ b/test/core/invariant/LockupDynamic.t.sol @@ -2,10 +2,9 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup, LockupDynamic } from "src/core/types/DataTypes.sol"; - -import { Lockup_Invariant_Test } from "./Lockup.t.sol"; import { LockupDynamicCreateHandler } from "./handlers/LockupDynamicCreateHandler.sol"; import { LockupDynamicHandler } from "./handlers/LockupDynamicHandler.sol"; +import { Lockup_Invariant_Test } from "./Lockup.t.sol"; /// @dev Invariant tests for {SablierLockupDynamic}. contract LockupDynamic_Invariant_Test is Lockup_Invariant_Test { diff --git a/test/core/invariant/LockupLinear.t.sol b/test/core/invariant/LockupLinear.t.sol index 37fbc3374..9673d643a 100644 --- a/test/core/invariant/LockupLinear.t.sol +++ b/test/core/invariant/LockupLinear.t.sol @@ -2,10 +2,9 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup } from "src/core/types/DataTypes.sol"; - -import { Lockup_Invariant_Test } from "./Lockup.t.sol"; -import { LockupLinearHandler } from "./handlers/LockupLinearHandler.sol"; import { LockupLinearCreateHandler } from "./handlers/LockupLinearCreateHandler.sol"; +import { LockupLinearHandler } from "./handlers/LockupLinearHandler.sol"; +import { Lockup_Invariant_Test } from "./Lockup.t.sol"; /// @dev Invariant tests for {SablierLockupLinear}. contract LockupLinear_Invariant_Test is Lockup_Invariant_Test { diff --git a/test/core/invariant/LockupTranched.t.sol b/test/core/invariant/LockupTranched.t.sol index 1e5d2e207..f0f75649b 100644 --- a/test/core/invariant/LockupTranched.t.sol +++ b/test/core/invariant/LockupTranched.t.sol @@ -2,10 +2,9 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup, LockupTranched } from "src/core/types/DataTypes.sol"; - -import { Lockup_Invariant_Test } from "./Lockup.t.sol"; import { LockupTranchedCreateHandler } from "./handlers/LockupTranchedCreateHandler.sol"; import { LockupTranchedHandler } from "./handlers/LockupTranchedHandler.sol"; +import { Lockup_Invariant_Test } from "./Lockup.t.sol"; /// @dev Invariant tests for {SablierLockupTranched}. contract LockupTranched_Invariant_Test is Lockup_Invariant_Test { diff --git a/test/core/unit/concrete/nft-descriptor/NFTDescriptor.t.sol b/test/core/unit/concrete/nft-descriptor/NFTDescriptor.t.sol index 4d08e0e35..25b0e5680 100644 --- a/test/core/unit/concrete/nft-descriptor/NFTDescriptor.t.sol +++ b/test/core/unit/concrete/nft-descriptor/NFTDescriptor.t.sol @@ -2,9 +2,8 @@ pragma solidity >=0.8.22 <0.9.0; import { LockupNFTDescriptor } from "src/core/LockupNFTDescriptor.sol"; - -import { NFTDescriptorMock } from "test/mocks/NFTDescriptorMock.sol"; import { Base_Test } from "test/Base.t.sol"; +import { NFTDescriptorMock } from "test/mocks/NFTDescriptorMock.sol"; contract NFTDescriptor_Unit_Concrete_Test is Base_Test, LockupNFTDescriptor { NFTDescriptorMock internal nftDescriptorMock; diff --git a/test/mocks/NFTDescriptorMock.sol b/test/mocks/NFTDescriptorMock.sol index 3a1ab79c3..de052f4ab 100644 --- a/test/mocks/NFTDescriptorMock.sol +++ b/test/mocks/NFTDescriptorMock.sol @@ -2,11 +2,10 @@ pragma solidity >=0.8.22; import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; - import { NFTSVG } from "src/core/libraries/NFTSVG.sol"; import { SVGElements } from "src/core/libraries/SVGElements.sol"; -import { Lockup } from "src/core/types/DataTypes.sol"; import { LockupNFTDescriptor } from "src/core/LockupNFTDescriptor.sol"; +import { Lockup } from "src/core/types/DataTypes.sol"; /// @dev This mock is needed for: /// - Running the tests against the `--via-ir` precompiles diff --git a/test/periphery/fork/Fork.t.sol b/test/periphery/fork/Fork.t.sol index 437a3d6d9..ac111cdd9 100644 --- a/test/periphery/fork/Fork.t.sol +++ b/test/periphery/fork/Fork.t.sol @@ -2,13 +2,11 @@ pragma solidity >=0.8.22 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - import { ISablierLockupDynamic } from "src/core/interfaces/ISablierLockupDynamic.sol"; import { ISablierLockupLinear } from "src/core/interfaces/ISablierLockupLinear.sol"; import { ISablierLockupTranched } from "src/core/interfaces/ISablierLockupTranched.sol"; - -import { Periphery_Test } from "../Periphery.t.sol"; -import { Merkle } from "../../utils/Murky.sol"; +import { Merkle } from "./../../utils/Murky.sol"; +import { Periphery_Test } from "./../Periphery.t.sol"; /// @notice Common logic needed by all fork tests. abstract contract Fork_Test is Periphery_Test, Merkle { diff --git a/test/periphery/fork/merkle-campaign/MerkleInstant.t.sol b/test/periphery/fork/merkle-campaign/MerkleInstant.t.sol index f899935e6..81cdb9c76 100644 --- a/test/periphery/fork/merkle-campaign/MerkleInstant.t.sol +++ b/test/periphery/fork/merkle-campaign/MerkleInstant.t.sol @@ -1,14 +1,12 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - +import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { ISablierMerkleInstant } from "src/periphery/interfaces/ISablierMerkleInstant.sol"; import { MerkleBase } from "src/periphery/types/DataTypes.sol"; - -import { MerkleBuilder } from "../../../utils/MerkleBuilder.sol"; -import { Fork_Test } from "../Fork.t.sol"; +import { MerkleBuilder } from "./../../../utils/MerkleBuilder.sol"; +import { Fork_Test } from "./../Fork.t.sol"; abstract contract MerkleInstant_Fork_Test is Fork_Test { using MerkleBuilder for uint256[]; diff --git a/test/periphery/fork/merkle-campaign/MerkleLL.t.sol b/test/periphery/fork/merkle-campaign/MerkleLL.t.sol index 68502b473..471b5e5ec 100644 --- a/test/periphery/fork/merkle-campaign/MerkleLL.t.sol +++ b/test/periphery/fork/merkle-campaign/MerkleLL.t.sol @@ -1,15 +1,13 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - +import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { Lockup, LockupLinear } from "src/core/types/DataTypes.sol"; import { ISablierMerkleLL } from "src/periphery/interfaces/ISablierMerkleLL.sol"; import { MerkleBase } from "src/periphery/types/DataTypes.sol"; - -import { MerkleBuilder } from "../../../utils/MerkleBuilder.sol"; -import { Fork_Test } from "../Fork.t.sol"; +import { MerkleBuilder } from "./../../../utils/MerkleBuilder.sol"; +import { Fork_Test } from "./../Fork.t.sol"; abstract contract MerkleLL_Fork_Test is Fork_Test { using MerkleBuilder for uint256[]; diff --git a/test/periphery/fork/merkle-campaign/MerkleLT.t.sol b/test/periphery/fork/merkle-campaign/MerkleLT.t.sol index 57838bf5c..bd945cdcf 100644 --- a/test/periphery/fork/merkle-campaign/MerkleLT.t.sol +++ b/test/periphery/fork/merkle-campaign/MerkleLT.t.sol @@ -1,15 +1,13 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - +import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { Lockup, LockupTranched } from "src/core/types/DataTypes.sol"; import { ISablierMerkleLT } from "src/periphery/interfaces/ISablierMerkleLT.sol"; import { MerkleBase } from "src/periphery/types/DataTypes.sol"; - -import { MerkleBuilder } from "../../../utils/MerkleBuilder.sol"; -import { Fork_Test } from "../Fork.t.sol"; +import { MerkleBuilder } from "./../../../utils/MerkleBuilder.sol"; +import { Fork_Test } from "./../Fork.t.sol"; abstract contract MerkleLT_Fork_Test is Fork_Test { using MerkleBuilder for uint256[]; diff --git a/test/periphery/integration/merkle-campaign/instant/claim/claim.t.sol b/test/periphery/integration/merkle-campaign/instant/claim/claim.t.sol index 5a6759f06..b3e192339 100644 --- a/test/periphery/integration/merkle-campaign/instant/claim/claim.t.sol +++ b/test/periphery/integration/merkle-campaign/instant/claim/claim.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { MerkleInstant_Integration_Shared_Test } from "../MerkleInstant.t.sol"; -import { Claim_Integration_Test } from "../../shared/claim/claim.t.sol"; +import { Claim_Integration_Test } from "./../../shared/claim/claim.t.sol"; +import { MerkleInstant_Integration_Shared_Test } from "./../MerkleInstant.t.sol"; contract Claim_MerkleInstant_Integration_Test is Claim_Integration_Test, MerkleInstant_Integration_Shared_Test { function setUp() public override(Claim_Integration_Test, MerkleInstant_Integration_Shared_Test) { diff --git a/test/periphery/integration/merkle-campaign/ll/claim/claim.t.sol b/test/periphery/integration/merkle-campaign/ll/claim/claim.t.sol index 6a0acf4de..b22592524 100644 --- a/test/periphery/integration/merkle-campaign/ll/claim/claim.t.sol +++ b/test/periphery/integration/merkle-campaign/ll/claim/claim.t.sol @@ -4,8 +4,8 @@ pragma solidity >=0.8.22 <0.9.0; import { Lockup, LockupLinear } from "src/core/types/DataTypes.sol"; import { MerkleLL } from "src/periphery/types/DataTypes.sol"; -import { MerkleLL_Integration_Shared_Test } from "../MerkleLL.t.sol"; import { Claim_Integration_Test } from "../../shared/claim/claim.t.sol"; +import { MerkleLL_Integration_Shared_Test } from "../MerkleLL.t.sol"; contract Claim_MerkleLL_Integration_Test is Claim_Integration_Test, MerkleLL_Integration_Shared_Test { MerkleLL.Schedule internal schedule; diff --git a/test/utils/Defaults.sol b/test/utils/Defaults.sol index 7bf6b80a1..12ac731db 100644 --- a/test/utils/Defaults.sol +++ b/test/utils/Defaults.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.22; -import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { Arrays } from "@openzeppelin/contracts/utils/Arrays.sol"; import { ud2x18, uUNIT } from "@prb/math/src/UD2x18.sol"; import { UD60x18, ud, ZERO } from "@prb/math/src/UD60x18.sol"; @@ -10,10 +10,10 @@ import { Broker, Lockup, LockupDynamic, LockupLinear, LockupTranched } from "../ import { BatchLockup, MerkleBase, MerkleLL, MerkleLT } from "../../src/periphery/types/DataTypes.sol"; import { ArrayBuilder } from "./ArrayBuilder.sol"; -import { Constants } from "./Constants.sol"; import { BatchLockupBuilder } from "./BatchLockupBuilder.sol"; -import { Merkle } from "./Murky.sol"; +import { Constants } from "./Constants.sol"; import { MerkleBuilder } from "./MerkleBuilder.sol"; +import { Merkle } from "./Murky.sol"; import { Users } from "./Types.sol"; /// @notice Contract with default values used throughout the tests. diff --git a/test/utils/Precompiles.t.sol b/test/utils/Precompiles.t.sol index f30771a19..3588d67b2 100644 --- a/test/utils/Precompiles.t.sol +++ b/test/utils/Precompiles.t.sol @@ -1,17 +1,15 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.22 <0.9.0; -import { LibString } from "solady/src/utils/LibString.sol"; - import { Precompiles } from "precompiles/Precompiles.sol"; +import { LibString } from "solady/src/utils/LibString.sol"; import { ILockupNFTDescriptor } from "src/core/interfaces/ILockupNFTDescriptor.sol"; import { ISablierLockupDynamic } from "src/core/interfaces/ISablierLockupDynamic.sol"; import { ISablierLockupLinear } from "src/core/interfaces/ISablierLockupLinear.sol"; import { ISablierLockupTranched } from "src/core/interfaces/ISablierLockupTranched.sol"; import { ISablierBatchLockup } from "src/periphery/interfaces/ISablierBatchLockup.sol"; import { ISablierMerkleFactory } from "src/periphery/interfaces/ISablierMerkleFactory.sol"; - -import { Base_Test } from "../Base.t.sol"; +import { Base_Test } from "./../Base.t.sol"; contract Precompiles_Test is Base_Test { using LibString for address;