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 50714ba61..dae3e9c4e 100755 Binary files a/bun.lockb and b/bun.lockb differ 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;