fix: changed import style for consistency

smart-transaction · Jul 30, 2024 · e501cca · e501cca
1 parent 75c86a2
commit e501cca
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 43 deletions.
diff --git a/script/test/CronCounter.s.sol → script/examples/CronCounter.s.sol b/script/test/CronCounter.s.sol → script/examples/CronCounter.s.sol
@@ -5,7 +5,6 @@ pragma solidity 0.8.26;
 import {Script} from "forge-std/Script.sol";
 import {BaseDeployer} from "../BaseDeployer.s.sol";
 import {CronCounter} from "test/examples/CronCounter.sol";
-import {MyErc20} from "test/examples/MyErc20.sol";
 
 /* solhint-disable no-console*/
 import {console2} from "forge-std/console2.sol";
@@ -51,10 +50,10 @@ contract DeployCronCounter is Script, BaseDeployer {
 
     /// @dev Function to perform actual deployment.
     function chainDeploySmartedContract() private broadcast(_deployerPrivateKey) {
-        address cronTwoCounter = address(new CronCounter{salt: _salt}(_callBreaker));
+        address cronCounter = address(new CronCounter{salt: _salt}(_callBreaker));
 
-        require(_create2addr == cronTwoCounter, "Address mismatch CronCounter");
+        require(_create2addr == cronCounter, "Address mismatch CronCounter");
 
-        console2.log("CronCounter deployed at address:", cronTwoCounter, "\n");
+        console2.log("CronCounter deployed at address:", cronCounter, "\n");
     }
 }
diff --git a/script/test/SelfCheckout.s.sol → script/examples/SelfCheckout.s.sol b/script/test/SelfCheckout.s.sol → script/examples/SelfCheckout.s.sol
diff --git a/test/AssociatedDataStorage.t.sol b/test/AssociatedDataStorage.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {Test} from "forge-std/Test.sol";
-import {AssociatedDataStorage, AssociatedDataLib} from "../src/CallBreakerTypes.sol";
+import {AssociatedDataStorage, AssociatedDataLib} from "src/CallBreakerTypes.sol";
 
 contract AssociatedDataStorageTest is Test {
     AssociatedDataStorage assocData;

diff --git a/test/CronCounter.t.sol b/test/CronCounter.t.sol
@@ -6,8 +6,8 @@ import "forge-std/Vm.sol";
 
 import "./solve-lib/CronCounterLib.sol";
 
-import "../src/lamination/Laminator.sol";
-import "../src/timetravel/CallBreaker.sol";
+import "src/lamination/Laminator.sol";
+import "src/timetravel/CallBreaker.sol";
 
 contract CronTest is Test, CronCounterLib {
     address deployer;

diff --git a/test/FlashLiquidity.t.sol b/test/FlashLiquidity.t.sol
@@ -3,8 +3,7 @@
 pragma solidity 0.8.26;
 
 import "forge-std/Test.sol";
-import "../src/timetravel/CallBreaker.sol";
-import "../test/solve-lib/FlashLiquidityLib.sol";
+import "test/solve-lib/FlashLiquidityLib.sol";
 
 contract FlashLiquidityTest is Test, FlashLiquidityLib {
     address deployer;

diff --git a/test/FlashPillTest.t.sol b/test/FlashPillTest.t.sol
@@ -3,8 +3,8 @@
 pragma solidity 0.8.26;
 
 import "forge-std/Test.sol";
-import "../src/timetravel/CallBreaker.sol";
-import "../test/examples/FlashPill.sol";
+import "src/timetravel/CallBreaker.sol";
+import "test/examples/FlashPill.sol";
 
 contract FlashPillTest is Test {
     CallBreaker private callbreaker;

diff --git a/test/NoopTurnerTest.t.sol b/test/NoopTurnerTest.t.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.26;
 
 import "forge-std/Test.sol";
-import "../src/timetravel/CallBreaker.sol";
-import "../test/examples/NoopTurner.sol";
+import "src/timetravel/CallBreaker.sol";
+import "test/examples/NoopTurner.sol";
 
 contract NoopTurnerTest is Test {
     CallBreaker public callbreaker;

diff --git a/test/PnP.t.sol b/test/PnP.t.sol
@@ -3,9 +3,9 @@
 pragma solidity 0.8.26;
 
 import "forge-std/Test.sol";
-import "../src/timetravel/CallBreaker.sol";
-import "../test/examples/PnP.sol";
-import "../test/solve-lib/PnPLib.sol";
+import "src/timetravel/CallBreaker.sol";
+import "test/examples/PnP.sol";
+import "test/solve-lib/PnPLib.sol";
 
 contract PnPTest is Test, PnPLib {
     address deployer;

diff --git a/test/Sandwich.t.sol b/test/Sandwich.t.sol
@@ -6,8 +6,8 @@ import "forge-std/Vm.sol";
 
 import "./solve-lib/CronCounterLib.sol";
 
-import "../src/lamination/Laminator.sol";
-import "../src/timetravel/CallBreaker.sol";
+import "src/lamination/Laminator.sol";
+import "src/timetravel/CallBreaker.sol";
 
 contract CronTest is Test, CronCounterLib {
     address deployer;

diff --git a/test/SlippageProtection.t.sol b/test/SlippageProtection.t.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.26;
 
 import "forge-std/Test.sol";
 import "src/timetravel/CallBreaker.sol";
-import "test/solve-lib/SlippageProtectionLib.sol";
+import "test/solve-lib/DeFi/SlippageProtectionLib.sol";
 
 contract SlippageProtectionTest is Test, SlippageProtectionLib {
     address deployer;

diff --git a/test/examples/CronCounter.sol b/test/examples/CronCounter.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.26;
 
-import "../../src/timetravel/SmarterContract.sol";
+import "src/timetravel/SmarterContract.sol";
 
 contract CronCounter is SmarterContract {
     mapping(address => uint256) private _counters;

diff --git a/test/examples/FlashLiquidity.sol → test/examples/DeFi/FlashLiquidity.sol b/test/examples/FlashLiquidity.sol → test/examples/DeFi/FlashLiquidity.sol
@@ -1,12 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
+import "forge-std/console.sol";
+
 import "openzeppelin/token/ERC20/ERC20.sol";
+import "test/utils/interfaces/IWeth.sol";
+import "test/utils/interfaces/ISwapRouter.sol";
 import "src/timetravel/CallBreaker.sol";
 import "src/timetravel/SmarterContract.sol";
 import "src/TimeTypes.sol";
-import "test/utils/interfaces/ISwapRouter.sol";
-import "test/utils/interfaces/IWeth.sol";
 
 address constant DAI = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
 address constant WETH9 = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
@@ -67,6 +69,7 @@ contract FlashLiquidity is SmarterContract {
 
         // The call to `exactInputSingle` executes the swap.
         uint256 amountOut = router.exactInputSingle(params);
+        console.log("WETH", amountOut);
 
         // check whether or not
         CallObject memory callObj = CallObject({

diff --git a/test/examples/SwapPool.sol → test/examples/DeFi/SwapPool.sol b/test/examples/SwapPool.sol → test/examples/DeFi/SwapPool.sol
@@ -6,8 +6,8 @@ import "src/timetravel/SmarterContract.sol";
 import "src/TimeTypes.sol";
 import "test/utils/interfaces/ISwapRouter.sol";
 
-import {IWETH, IERC20} from "../utils/interfaces/IWeth.sol";
-import {IPositionManager} from "../utils/interfaces/IPositionManager.sol";
+import {IWETH, IERC20} from "test/utils/interfaces/IWeth.sol";
+import {IPositionManager} from "test/utils/interfaces/IPositionManager.sol";
 
 // pool fee, 0.3%.
 uint24 constant poolFee = 3000;

diff --git a/test/examples/FlashPill.sol b/test/examples/FlashPill.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.26;
 
 import "openzeppelin/token/ERC20/IERC20.sol";
-import "../../src/timetravel/CallBreaker.sol";
-import "../../src/timetravel/SmarterContract.sol";
+import "src/timetravel/CallBreaker.sol";
+import "src/timetravel/SmarterContract.sol";
 
 contract FlashPill is IERC20, SmarterContract {
     mapping(address => uint256) private _balances;

diff --git a/test/examples/NoopTurner.sol b/test/examples/NoopTurner.sol
@@ -2,9 +2,9 @@
 
 pragma solidity 0.8.26;
 
-import "../../src/timetravel/CallBreaker.sol";
-import "../../src/timetravel/SmarterContract.sol";
-import "../../src/TimeTypes.sol";
+import "src/timetravel/CallBreaker.sol";
+import "src/timetravel/SmarterContract.sol";
+import "src/TimeTypes.sol";
 
 contract NoopTurner is SmarterContract {
     address private _callbreakerAddress;

diff --git a/test/examples/PnP.sol b/test/examples/PnP.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.26;
 
-import "../../src/timetravel/CallBreaker.sol";
+import "src/timetravel/CallBreaker.sol";
 
 contract PnP {
     address private _callbreakerAddress;

diff --git a/test/solve-lib/CronCounterLib.sol b/test/solve-lib/CronCounterLib.sol
@@ -3,10 +3,10 @@ pragma solidity 0.8.26;
 
 import "forge-std/Vm.sol";
 
-import "../../src/lamination/Laminator.sol";
-import "../../src/timetravel/CallBreaker.sol";
-import "../../test/examples/CronCounter.sol";
-import "../../src/timetravel/SmarterContract.sol";
+import "src/lamination/Laminator.sol";
+import "src/timetravel/CallBreaker.sol";
+import "test/examples/CronCounter.sol";
+import "src/timetravel/SmarterContract.sol";
 
 // for the next year, every day:
 // tip the pusher with a little eth

diff --git a/test/solve-lib/FlashLiquidityLib.sol → test/solve-lib/DeFi/FlashLiquidityLib.sol b/test/solve-lib/FlashLiquidityLib.sol → test/solve-lib/DeFi/FlashLiquidityLib.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.26;
 import "src/lamination/Laminator.sol";
 import "src/timetravel/CallBreaker.sol";
 import "src/timetravel/SmarterContract.sol";
-import "test/examples/SwapPool.sol";
+import "test/examples/DeFi/SwapPool.sol";
 import "test/utils/MockERC20Token.sol";
 import "test/utils/MockSwapRouter.sol";
 import "test/utils/MockPositionManager.sol";

diff --git a/test/solve-lib/SlippageProtectionLib.sol → .../solve-lib/DeFi/SlippageProtectionLib.sol b/test/solve-lib/SlippageProtectionLib.sol → .../solve-lib/DeFi/SlippageProtectionLib.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.26;
 
 import "src/lamination/Laminator.sol";
 import "src/timetravel/CallBreaker.sol";
-import "test/examples/SwapPool.sol";
+import "test/examples/DeFi/SwapPool.sol";
 import "test/utils/MockERC20Token.sol";
 import "test/utils/MockSwapRouter.sol";
 import "test/utils/MockPositionManager.sol";

diff --git a/test/solve-lib/PnPLib.sol b/test/solve-lib/PnPLib.sol
@@ -3,10 +3,10 @@ pragma solidity 0.8.26;
 
 import "forge-std/Vm.sol";
 
-import "../../src/lamination/Laminator.sol";
-import "../../src/timetravel/CallBreaker.sol";
-import "../../test/examples/PnP.sol";
-import "../../src/timetravel/SmarterContract.sol";
+import "src/lamination/Laminator.sol";
+import "src/timetravel/CallBreaker.sol";
+import "src/timetravel/SmarterContract.sol";
+import "test/examples/PnP.sol";
 
 contract PnPLib {
     address payable public pusherLaminated;

diff --git a/test/utils/MockPositionManager.sol b/test/utils/MockPositionManager.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 import {IPositionManager} from "./interfaces/IPositionManager.sol";
-import {ISwapRouter} from "../utils/interfaces/ISwapRouter.sol";
+import {ISwapRouter} from "./interfaces/ISwapRouter.sol";
 
 /**
  * @notice Oversimplified mock version of a Position Manager

diff --git a/test/utils/MockSwapRouter.sol b/test/utils/MockSwapRouter.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
-import {IWETH, IERC20} from "../utils/interfaces/IWeth.sol";
-import {ISwapRouter} from "../utils/interfaces/ISwapRouter.sol";
+import {IWETH, IERC20} from "./interfaces/IWeth.sol";
+import {ISwapRouter} from "./interfaces/ISwapRouter.sol";
 
 /**
  * @notice Oversimplified mock version of a router