From 3e3ab5dfbf478b21adb64ab81a332229fb4c753b Mon Sep 17 00:00:00 2001
From: Mark Toda <toda.mark@gmail.com>
Date: Thu, 16 Nov 2023 16:13:26 -0500
Subject: [PATCH] fix: tests

---
 .forge-snapshots/TWAMMSubmitOrder.snap | 2 +-
 foundry.toml                           | 1 +
 test/FullRange.t.sol                   | 3 +++
 test/GeomeanOracle.t.sol               | 3 +++
 test/LimitOrder.t.sol                  | 3 +++
 test/TWAMM.t.sol                       | 3 +++
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
index 9adc49a6..d01ad33f 100644
--- a/.forge-snapshots/TWAMMSubmitOrder.snap
+++ b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-123576
\ No newline at end of file
+123619
\ No newline at end of file
diff --git a/foundry.toml b/foundry.toml
index b3132187..7c32d4b3 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -5,6 +5,7 @@ solc_version = '0.8.20'
 optimizer_runs = 800
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}]
+cancun = true
 
 [profile.ci]
 fuzz_runs = 100000
diff --git a/test/FullRange.t.sol b/test/FullRange.t.sol
index 0658d683..49a7b98d 100644
--- a/test/FullRange.t.sol
+++ b/test/FullRange.t.sol
@@ -76,6 +76,9 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
     PoolId idWithLiq;
 
     function setUp() public {
+        deployFreshManagerAndRouters();
+        (currency0, currency1) = deployMintAndApprove2Currencies();
+
         token0 = new MockERC20("TestA", "A", 18);
         token1 = new MockERC20("TestB", "B", 18);
         token2 = new MockERC20("TestC", "C", 18);
diff --git a/test/GeomeanOracle.t.sol b/test/GeomeanOracle.t.sol
index 96bc7100..ce34adbd 100644
--- a/test/GeomeanOracle.t.sol
+++ b/test/GeomeanOracle.t.sol
@@ -36,6 +36,9 @@ contract TestGeomeanOracle is Test, Deployers {
     PoolId id;
 
     function setUp() public {
+        deployFreshManagerAndRouters();
+        (currency0, currency1) = deployMintAndApprove2Currencies();
+
         token0 = TestERC20(Currency.unwrap(currency0));
         token1 = TestERC20(Currency.unwrap(currency1));
 
diff --git a/test/LimitOrder.t.sol b/test/LimitOrder.t.sol
index 02eef332..222e94c8 100644
--- a/test/LimitOrder.t.sol
+++ b/test/LimitOrder.t.sol
@@ -27,6 +27,9 @@ contract TestLimitOrder is Test, Deployers {
     PoolId id;
 
     function setUp() public {
+        deployFreshManagerAndRouters();
+        (currency0, currency1) = deployMintAndApprove2Currencies();
+
         token0 = TestERC20(Currency.unwrap(currency0));
         token1 = TestERC20(Currency.unwrap(currency1));
 
diff --git a/test/TWAMM.t.sol b/test/TWAMM.t.sol
index f313f9d7..575d3e6f 100644
--- a/test/TWAMM.t.sol
+++ b/test/TWAMM.t.sol
@@ -55,6 +55,9 @@ contract TWAMMTest is Test, Deployers, GasSnapshot {
     PoolId poolId;
 
     function setUp() public {
+        deployFreshManagerAndRouters();
+        (currency0, currency1) = deployMintAndApprove2Currencies();
+
         token0 = MockERC20(Currency.unwrap(currency0));
         token1 = MockERC20(Currency.unwrap(currency1));