fix: tests

Uniswap · Nov 16, 2023 · 3e3ab5d · 3e3ab5d
1 parent d526f75
commit 3e3ab5d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 1 deletion.
diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-123576
+123619
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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));