moved FeeQuoter tests out to parent

smartcontractkit · Nov 11, 2024 · b039d1f · b039d1f
1 parent ca63592
commit b039d1f
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 59 deletions.
diff --git a/...eQuoter.applyDestChainConfigUpdates.t.sol → ...eQuoter.applyDestChainConfigUpdates.t.sol b/...eQuoter.applyDestChainConfigUpdates.t.sol → ...eQuoter.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/...ter/FeeQuoter.applyFeeTokensUpdates.t.sol → ...ter/FeeQuoter.applyFeeTokensUpdates.t.sol b/...ter/FeeQuoter.applyFeeTokensUpdates.t.sol → ...ter/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/...lyPremiumMultiplierWeiPerEthUpdates.t.sol → ...lyPremiumMultiplierWeiPerEthUpdates.t.sol b/...lyPremiumMultiplierWeiPerEthUpdates.t.sol → ...lyPremiumMultiplierWeiPerEthUpdates.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/....applyTokenTransferFeeConfigUpdates.t.sol → ....applyTokenTransferFeeConfigUpdates.t.sol b/....applyTokenTransferFeeConfigUpdates.t.sol → ....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/...ter/FeeQuoter/FeeQuoter.constructor.t.sol → ...est/feeQuoter/FeeQuoter.constructor.t.sol b/...ter/FeeQuoter/FeeQuoter.constructor.t.sol → ...est/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/...Quoter/FeeQuoter.convertTokenAmount.t.sol → ...Quoter/FeeQuoter.convertTokenAmount.t.sol b/...Quoter/FeeQuoter.convertTokenAmount.t.sol → ...Quoter/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/...r/FeeQuoter.getDataAvailabilityCost.t.sol → ...r/FeeQuoter.getDataAvailabilityCost.t.sol b/...r/FeeQuoter.getDataAvailabilityCost.t.sol → ...r/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/...oter/FeeQuoter.getTokenAndGasPrices.t.sol → ...oter/FeeQuoter.getTokenAndGasPrices.t.sol b/...oter/FeeQuoter.getTokenAndGasPrices.t.sol → ...oter/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/...r/FeeQuoter/FeeQuoter.getTokenPrice.t.sol → ...t/feeQuoter/FeeQuoter.getTokenPrice.t.sol b/...r/FeeQuoter/FeeQuoter.getTokenPrice.t.sol → ...t/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/.../FeeQuoter/FeeQuoter.getTokenPrices.t.sol → .../feeQuoter/FeeQuoter.getTokenPrices.t.sol b/.../FeeQuoter/FeeQuoter.getTokenPrices.t.sol → .../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/...oter/FeeQuoter.getTokenTransferCost.t.sol → ...oter/FeeQuoter.getTokenTransferCost.t.sol b/...oter/FeeQuoter.getTokenTransferCost.t.sol → ...oter/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/...FeeQuoter/FeeQuoter.getValidatedFee.t.sol → ...feeQuoter/FeeQuoter.getValidatedFee.t.sol b/...FeeQuoter/FeeQuoter.getValidatedFee.t.sol → ...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/...er/FeeQuoter.getValidatedTokenPrice.t.sol → ...er/FeeQuoter.getValidatedTokenPrice.t.sol b/...er/FeeQuoter.getValidatedTokenPrice.t.sol → ...er/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/...Quoter/FeeQuoter/FeeQuoter.onReport.t.sol → ...p/test/feeQuoter/FeeQuoter.onReport.t.sol b/...Quoter/FeeQuoter/FeeQuoter.onReport.t.sol → ...p/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/...eeQuoter.parseEVMExtraArgsFromBytes.t.sol → ...eeQuoter.parseEVMExtraArgsFromBytes.t.sol b/...eeQuoter.parseEVMExtraArgsFromBytes.t.sol → ...eeQuoter.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/...Quoter/FeeQuoter.processMessageArgs.t.sol → ...Quoter/FeeQuoter.processMessageArgs.t.sol b/...Quoter/FeeQuoter.processMessageArgs.t.sol → ...Quoter/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/...er/FeeQuoter/FeeQuoter.updatePrices.t.sol → ...st/feeQuoter/FeeQuoter.updatePrices.t.sol b/...er/FeeQuoter/FeeQuoter.updatePrices.t.sol → ...st/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/...ter/FeeQuoter.updateTokenPriceFeeds.t.sol → ...ter/FeeQuoter.updateTokenPriceFeeds.t.sol b/...ter/FeeQuoter.updateTokenPriceFeeds.t.sol → ...ter/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/...FeeQuoter.validateDestFamilyAddress.t.sol → ...FeeQuoter.validateDestFamilyAddress.t.sol b/...FeeQuoter.validateDestFamilyAddress.t.sol → ...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/.../feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol → .../ccip/test/feeQuoter/FeeQuoterSetup.t.sol b/.../feeQuoter/FeeQuoter/FeeQuoterSetup.t.sol → .../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
@@ -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
@@ -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/.../v0.8/ccip/test/rateLimiter/MutiAggregateRateLimiter/MultiAggregateRateLimiterSetup.t.sol b/.../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 {