diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyDestChainConfigUpdates.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyDestChainConfigUpdates.t.sol similarity index 98% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyDestChainConfigUpdates.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyDestChainConfigUpdates.t.sol index f092a1deec3..44fe0e33eba 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyDestChainConfigUpdates.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyDestChainConfigUpdates.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_applyDestChainConfigUpdates is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyFeeTokensUpdates.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyFeeTokensUpdates.t.sol similarity index 93% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyFeeTokensUpdates.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyFeeTokensUpdates.t.sol index 1985c926a3b..a32e50bb3e4 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyFeeTokensUpdates.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyFeeTokensUpdates.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {Ownable2Step} from "../../../../shared/access/Ownable2Step.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; +import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_applyFeeTokensUpdates is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyPremiumMultiplierWeiPerEthUpdates.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyPremiumMultiplierWeiPerEthUpdates.t.sol similarity index 96% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyPremiumMultiplierWeiPerEthUpdates.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyPremiumMultiplierWeiPerEthUpdates.t.sol index 7fb0cc8fcaf..d31202e8a99 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyPremiumMultiplierWeiPerEthUpdates.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyPremiumMultiplierWeiPerEthUpdates.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {Ownable2Step} from "../../../../shared/access/Ownable2Step.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; +import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyTokenTransferFeeConfigUpdates.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyTokenTransferFeeConfigUpdates.t.sol similarity index 97% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyTokenTransferFeeConfigUpdates.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyTokenTransferFeeConfigUpdates.t.sol index eb12a289425..72ef7b89a75 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.applyTokenTransferFeeConfigUpdates.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.applyTokenTransferFeeConfigUpdates.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {Ownable2Step} from "../../../../shared/access/Ownable2Step.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Pool} from "../../../libraries/Pool.sol"; +import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Pool} from "../../libraries/Pool.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_applyTokenTransferFeeConfigUpdates is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.constructor.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.constructor.t.sol similarity index 97% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.constructor.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.constructor.t.sol index 080834b66b0..c2d36bee96d 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.constructor.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.constructor.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {FeeQuoterHelper} from "../../helpers/FeeQuoterHelper.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {FeeQuoterHelper} from "../helpers/FeeQuoterHelper.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_constructor is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.convertTokenAmount.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.convertTokenAmount.t.sol similarity index 96% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.convertTokenAmount.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.convertTokenAmount.t.sol index b28df6c1e82..ca6a7e16126 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.convertTokenAmount.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.convertTokenAmount.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_convertTokenAmount is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getDataAvailabilityCost.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getDataAvailabilityCost.t.sol similarity index 98% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getDataAvailabilityCost.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getDataAvailabilityCost.t.sol index fd102172611..2e498746c3d 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getDataAvailabilityCost.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getDataAvailabilityCost.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_getDataAvailabilityCost is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenAndGasPrices.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenAndGasPrices.t.sol similarity index 96% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenAndGasPrices.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenAndGasPrices.t.sol index 24417903c0b..18ccf5efa79 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenAndGasPrices.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenAndGasPrices.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_getTokenAndGasPrices is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenPrice.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenPrice.t.sol similarity index 91% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenPrice.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenPrice.t.sol index 7494af3790c..c00e750d27f 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenPrice.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenPrice.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {MockV3Aggregator} from "../../../../tests/MockV3Aggregator.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {MockV3Aggregator} from "../../../tests/MockV3Aggregator.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_getTokenPrice is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenPrices.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenPrices.t.sol similarity index 93% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenPrices.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenPrices.t.sol index 0c1d22e45bd..63f936332fd 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenPrices.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenPrices.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {Internal} from "../../../libraries/Internal.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_getTokenPrices is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenTransferCost.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenTransferCost.t.sol similarity index 98% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenTransferCost.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenTransferCost.t.sol index 875b2f30e51..a426775ca63 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getTokenTransferCost.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getTokenTransferCost.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Client} from "../../../libraries/Client.sol"; -import {Pool} from "../../../libraries/Pool.sol"; -import {USDPriceWith18Decimals} from "../../../libraries/USDPriceWith18Decimals.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Client} from "../../libraries/Client.sol"; +import {Pool} from "../../libraries/Pool.sol"; +import {USDPriceWith18Decimals} from "../../libraries/USDPriceWith18Decimals.sol"; import {FeeQuoterFeeSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_getTokenTransferCost is FeeQuoterFeeSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getValidatedFee.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getValidatedFee.t.sol similarity index 97% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getValidatedFee.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getValidatedFee.t.sol index 32e5764c32c..fdafde91f62 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getValidatedFee.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getValidatedFee.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Client} from "../../../libraries/Client.sol"; -import {Internal} from "../../../libraries/Internal.sol"; -import {Pool} from "../../../libraries/Pool.sol"; -import {USDPriceWith18Decimals} from "../../../libraries/USDPriceWith18Decimals.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Client} from "../../libraries/Client.sol"; +import {Internal} from "../../libraries/Internal.sol"; +import {Pool} from "../../libraries/Pool.sol"; +import {USDPriceWith18Decimals} from "../../libraries/USDPriceWith18Decimals.sol"; import {FeeQuoterFeeSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_getValidatedFee is FeeQuoterFeeSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getValidatedTokenPrice.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getValidatedTokenPrice.t.sol similarity index 97% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getValidatedTokenPrice.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getValidatedTokenPrice.t.sol index 847dc5cff43..6d508bc9116 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.getValidatedTokenPrice.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.getValidatedTokenPrice.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {MockV3Aggregator} from "../../../../tests/MockV3Aggregator.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {MockV3Aggregator} from "../../../tests/MockV3Aggregator.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_getValidatedTokenPrice is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.onReport.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.onReport.t.sol similarity index 97% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.onReport.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.onReport.t.sol index dd587490abb..aba4e178865 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.onReport.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.onReport.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {KeystoneFeedsPermissionHandler} from "../../../../keystone/KeystoneFeedsPermissionHandler.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; +import {KeystoneFeedsPermissionHandler} from "../../../keystone/KeystoneFeedsPermissionHandler.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_onReport is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.parseEVMExtraArgsFromBytes.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.parseEVMExtraArgsFromBytes.t.sol similarity index 96% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.parseEVMExtraArgsFromBytes.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.parseEVMExtraArgsFromBytes.t.sol index d0968bd18b9..8f4e3f954ca 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.parseEVMExtraArgsFromBytes.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.parseEVMExtraArgsFromBytes.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Client} from "../../../libraries/Client.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Client} from "../../libraries/Client.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_parseEVMExtraArgsFromBytes is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.processMessageArgs.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.processMessageArgs.t.sol similarity index 97% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.processMessageArgs.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.processMessageArgs.t.sol index 8869931047e..65baa576ead 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.processMessageArgs.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.processMessageArgs.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Client} from "../../../libraries/Client.sol"; -import {Internal} from "../../../libraries/Internal.sol"; -import {Pool} from "../../../libraries/Pool.sol"; -import {USDPriceWith18Decimals} from "../../../libraries/USDPriceWith18Decimals.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Client} from "../../libraries/Client.sol"; +import {Internal} from "../../libraries/Internal.sol"; +import {Pool} from "../../libraries/Pool.sol"; +import {USDPriceWith18Decimals} from "../../libraries/USDPriceWith18Decimals.sol"; import {FeeQuoterFeeSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_processMessageArgs is FeeQuoterFeeSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.updatePrices.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.updatePrices.t.sol similarity index 96% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.updatePrices.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.updatePrices.t.sol index 5025fffc426..d40ac7d33ad 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.updatePrices.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.updatePrices.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {AuthorizedCallers} from "../../../../shared/access/AuthorizedCallers.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {AuthorizedCallers} from "../../../shared/access/AuthorizedCallers.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_updatePrices is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.updateTokenPriceFeeds.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.updateTokenPriceFeeds.t.sol similarity index 96% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.updateTokenPriceFeeds.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.updateTokenPriceFeeds.t.sol index 904fc572151..9341fab121b 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.updateTokenPriceFeeds.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.updateTokenPriceFeeds.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {Ownable2Step} from "../../../../shared/access/Ownable2Step.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Internal} from "../../../libraries/Internal.sol"; +import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; import {Vm} from "forge-std/Vm.sol"; diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.validateDestFamilyAddress.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.validateDestFamilyAddress.t.sol similarity index 96% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.validateDestFamilyAddress.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.validateDestFamilyAddress.t.sol index fca2089ee61..761cb7546a9 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoter.validateDestFamilyAddress.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter.validateDestFamilyAddress.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {Internal} from "../../../libraries/Internal.sol"; +import {Internal} from "../../libraries/Internal.sol"; import {FeeQuoterSetup} from "./FeeQuoterSetup.t.sol"; contract FeeQuoter_validateDestFamilyAddress is FeeQuoterSetup { diff --git a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol similarity index 97% rename from contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol rename to contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol index 9b76e0e9ce6..a6551c554e6 100644 --- a/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol +++ b/contracts/src/v0.8/ccip/test/feeQuoter/FeeQuoterSetup.t.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity 0.8.24; -import {MockV3Aggregator} from "../../../../tests/MockV3Aggregator.sol"; -import {FeeQuoter} from "../../../FeeQuoter.sol"; -import {Client} from "../../../libraries/Client.sol"; -import {Internal} from "../../../libraries/Internal.sol"; -import {TokenAdminRegistry} from "../../../tokenAdminRegistry/TokenAdminRegistry.sol"; -import {TokenSetup} from "../../TokenSetup.t.sol"; -import {FeeQuoterHelper} from "../../helpers/FeeQuoterHelper.sol"; +import {MockV3Aggregator} from "../../../tests/MockV3Aggregator.sol"; +import {FeeQuoter} from "../../FeeQuoter.sol"; +import {Client} from "../../libraries/Client.sol"; +import {Internal} from "../../libraries/Internal.sol"; +import {TokenAdminRegistry} from "../../tokenAdminRegistry/TokenAdminRegistry.sol"; +import {TokenSetup} from "../TokenSetup.t.sol"; +import {FeeQuoterHelper} from "../helpers/FeeQuoterHelper.sol"; contract FeeQuoterSetup is TokenSetup { uint112 internal constant USD_PER_GAS = 1e6; // 0.001 gwei diff --git a/contracts/src/v0.8/ccip/test/offRamp/OffRamp/OffRampSetup.t.sol b/contracts/src/v0.8/ccip/test/offRamp/OffRamp/OffRampSetup.t.sol index 40d47b56741..8e33f05c61d 100644 --- a/contracts/src/v0.8/ccip/test/offRamp/OffRamp/OffRampSetup.t.sol +++ b/contracts/src/v0.8/ccip/test/offRamp/OffRamp/OffRampSetup.t.sol @@ -11,7 +11,7 @@ import {Client} from "../../../libraries/Client.sol"; import {Internal} from "../../../libraries/Internal.sol"; import {MultiOCR3Base} from "../../../ocr/MultiOCR3Base.sol"; import {OffRamp} from "../../../offRamp/OffRamp.sol"; -import {FeeQuoterSetup} from "../../feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol"; +import {FeeQuoterSetup} from "../../feeQuoter/FeeQuoterSetup.t.sol"; import {MaybeRevertingBurnMintTokenPool} from "../../helpers/MaybeRevertingBurnMintTokenPool.sol"; import {MessageInterceptorHelper} from "../../helpers/MessageInterceptorHelper.sol"; import {OffRampHelper} from "../../helpers/OffRampHelper.sol"; diff --git a/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRampSetup.t.sol b/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRampSetup.t.sol index 14fbd6d1d02..ead9e7088ce 100644 --- a/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRampSetup.t.sol +++ b/contracts/src/v0.8/ccip/test/onRamp/OnRamp/OnRampSetup.t.sol @@ -10,7 +10,7 @@ import {Client} from "../../../libraries/Client.sol"; import {Internal} from "../../../libraries/Internal.sol"; import {OnRamp} from "../../../onRamp/OnRamp.sol"; import {TokenAdminRegistry} from "../../../tokenAdminRegistry/TokenAdminRegistry.sol"; -import {FeeQuoterFeeSetup} from "../../feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol"; +import {FeeQuoterFeeSetup} from "../../feeQuoter/FeeQuoterSetup.t.sol"; import {OnRampHelper} from "../../helpers/OnRampHelper.sol"; import {IERC20} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/src/v0.8/ccip/test/rateLimiter/MutiAggregateRateLimiter/MultiAggregateRateLimiterSetup.t.sol b/contracts/src/v0.8/ccip/test/rateLimiter/MutiAggregateRateLimiter/MultiAggregateRateLimiterSetup.t.sol index 445d65e01c5..d3e87f5faa4 100644 --- a/contracts/src/v0.8/ccip/test/rateLimiter/MutiAggregateRateLimiter/MultiAggregateRateLimiterSetup.t.sol +++ b/contracts/src/v0.8/ccip/test/rateLimiter/MutiAggregateRateLimiter/MultiAggregateRateLimiterSetup.t.sol @@ -7,7 +7,7 @@ import {Internal} from "../../../libraries/Internal.sol"; import {RateLimiter} from "../../../libraries/RateLimiter.sol"; import {BaseTest} from "../../BaseTest.t.sol"; -import {FeeQuoterSetup} from "../../feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol"; +import {FeeQuoterSetup} from "../../feeQuoter/FeeQuoterSetup.t.sol"; import {MultiAggregateRateLimiterHelper} from "../../helpers/MultiAggregateRateLimiterHelper.sol"; contract MultiAggregateRateLimiterSetup is BaseTest, FeeQuoterSetup {