From e9ed39b77a0ae8975b117849c2a4256e3ef9360d Mon Sep 17 00:00:00 2001
From: Chris Buckland <cpbuckland88@gmail.com>
Date: Fri, 13 Dec 2024 19:05:24 +0000
Subject: [PATCH] Moved contracts to mocks

---
 .../fee-token-pricer}/ConstantExchangeRatePricer.sol     | 0
 .../OwnerAdjustableExchangeRatePricer.sol                | 0
 .../mocks/fee-token-pricer}/README.md                    | 0
 .../fee-token-pricer}/trade-tracker/TradeTracker.sol     | 0
 .../fee-token-pricer}/uniswap-v2-twap/FixedPoint.sol     | 0
 .../mocks/fee-token-pricer}/uniswap-v2-twap/FullMath.sol | 0
 .../uniswap-v2-twap/UniswapV2TwapPricer.sol              | 0
 .../{trade-tracker => }/TradeTracker.t.sol               | 9 ++++-----
 8 files changed, 4 insertions(+), 5 deletions(-)
 rename {test/foundry/fee-token-pricers => src/mocks/fee-token-pricer}/ConstantExchangeRatePricer.sol (100%)
 rename {test/foundry/fee-token-pricers => src/mocks/fee-token-pricer}/OwnerAdjustableExchangeRatePricer.sol (100%)
 rename {test/foundry/fee-token-pricers => src/mocks/fee-token-pricer}/README.md (100%)
 rename {test/foundry/fee-token-pricers => src/mocks/fee-token-pricer}/trade-tracker/TradeTracker.sol (100%)
 rename {test/foundry/fee-token-pricers => src/mocks/fee-token-pricer}/uniswap-v2-twap/FixedPoint.sol (100%)
 rename {test/foundry/fee-token-pricers => src/mocks/fee-token-pricer}/uniswap-v2-twap/FullMath.sol (100%)
 rename {test/foundry/fee-token-pricers => src/mocks/fee-token-pricer}/uniswap-v2-twap/UniswapV2TwapPricer.sol (100%)
 rename test/foundry/fee-token-pricers/{trade-tracker => }/TradeTracker.t.sol (93%)

diff --git a/test/foundry/fee-token-pricers/ConstantExchangeRatePricer.sol b/src/mocks/fee-token-pricer/ConstantExchangeRatePricer.sol
similarity index 100%
rename from test/foundry/fee-token-pricers/ConstantExchangeRatePricer.sol
rename to src/mocks/fee-token-pricer/ConstantExchangeRatePricer.sol
diff --git a/test/foundry/fee-token-pricers/OwnerAdjustableExchangeRatePricer.sol b/src/mocks/fee-token-pricer/OwnerAdjustableExchangeRatePricer.sol
similarity index 100%
rename from test/foundry/fee-token-pricers/OwnerAdjustableExchangeRatePricer.sol
rename to src/mocks/fee-token-pricer/OwnerAdjustableExchangeRatePricer.sol
diff --git a/test/foundry/fee-token-pricers/README.md b/src/mocks/fee-token-pricer/README.md
similarity index 100%
rename from test/foundry/fee-token-pricers/README.md
rename to src/mocks/fee-token-pricer/README.md
diff --git a/test/foundry/fee-token-pricers/trade-tracker/TradeTracker.sol b/src/mocks/fee-token-pricer/trade-tracker/TradeTracker.sol
similarity index 100%
rename from test/foundry/fee-token-pricers/trade-tracker/TradeTracker.sol
rename to src/mocks/fee-token-pricer/trade-tracker/TradeTracker.sol
diff --git a/test/foundry/fee-token-pricers/uniswap-v2-twap/FixedPoint.sol b/src/mocks/fee-token-pricer/uniswap-v2-twap/FixedPoint.sol
similarity index 100%
rename from test/foundry/fee-token-pricers/uniswap-v2-twap/FixedPoint.sol
rename to src/mocks/fee-token-pricer/uniswap-v2-twap/FixedPoint.sol
diff --git a/test/foundry/fee-token-pricers/uniswap-v2-twap/FullMath.sol b/src/mocks/fee-token-pricer/uniswap-v2-twap/FullMath.sol
similarity index 100%
rename from test/foundry/fee-token-pricers/uniswap-v2-twap/FullMath.sol
rename to src/mocks/fee-token-pricer/uniswap-v2-twap/FullMath.sol
diff --git a/test/foundry/fee-token-pricers/uniswap-v2-twap/UniswapV2TwapPricer.sol b/src/mocks/fee-token-pricer/uniswap-v2-twap/UniswapV2TwapPricer.sol
similarity index 100%
rename from test/foundry/fee-token-pricers/uniswap-v2-twap/UniswapV2TwapPricer.sol
rename to src/mocks/fee-token-pricer/uniswap-v2-twap/UniswapV2TwapPricer.sol
diff --git a/test/foundry/fee-token-pricers/trade-tracker/TradeTracker.t.sol b/test/foundry/fee-token-pricers/TradeTracker.t.sol
similarity index 93%
rename from test/foundry/fee-token-pricers/trade-tracker/TradeTracker.t.sol
rename to test/foundry/fee-token-pricers/TradeTracker.t.sol
index 46e90e478..c53e2ed5f 100644
--- a/test/foundry/fee-token-pricers/trade-tracker/TradeTracker.t.sol
+++ b/test/foundry/fee-token-pricers/TradeTracker.t.sol
@@ -2,12 +2,11 @@
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
-import {TradeTracker, IERC20} from "./TradeTracker.sol";
-import "../../../../src/bridge/SequencerInbox.sol";
-import {ERC20Bridge} from "../../../../src/bridge/ERC20Bridge.sol";
+import {TradeTracker, IERC20} from "../../../src/mocks/fee-token-pricer/trade-tracker/TradeTracker.sol";
+import "../../../src/bridge/SequencerInbox.sol";
+import {ERC20Bridge} from "../../../src/bridge/ERC20Bridge.sol";
 import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
-
-import "../../util/TestUtil.sol";
+import "../util/TestUtil.sol";
 
 contract SimpleTradeTracker is TradeTracker {
     constructor(