From 4a974568ebbe4d4519bdd6736a33a8e3764be018 Mon Sep 17 00:00:00 2001 From: Emily Williams Date: Thu, 10 Aug 2023 15:55:57 -0400 Subject: [PATCH] finish up --- .forge-snapshots/TWAMMSubmitOrder.snap | 2 +- lib/v4-core | 2 +- test/TWAMM.t.sol | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap index e5ad5591..a7f90301 100644 --- a/.forge-snapshots/TWAMMSubmitOrder.snap +++ b/.forge-snapshots/TWAMMSubmitOrder.snap @@ -1 +1 @@ -124175 \ No newline at end of file +123870 \ No newline at end of file diff --git a/lib/v4-core b/lib/v4-core index ffa4af87..3b724503 160000 --- a/lib/v4-core +++ b/lib/v4-core @@ -1 +1 @@ -Subproject commit ffa4af8759aa416497c94c1693dc53c6e9961f89 +Subproject commit 3b724503d4c3fa4872ac0b4f9b12f694774224a4 diff --git a/test/TWAMM.t.sol b/test/TWAMM.t.sol index f1282e6f..6da84b3b 100644 --- a/test/TWAMM.t.sol +++ b/test/TWAMM.t.sol @@ -16,12 +16,13 @@ import {PoolModifyPositionTest} from "@uniswap/v4-core/contracts/test/PoolModify import {PoolSwapTest} from "@uniswap/v4-core/contracts/test/PoolSwapTest.sol"; import {PoolDonateTest} from "@uniswap/v4-core/contracts/test/PoolDonateTest.sol"; import {Deployers} from "@uniswap/v4-core/test/foundry-tests/utils/Deployers.sol"; +import {TokenFixture} from "@uniswap/v4-core/test/foundry-tests/utils/TokenFixture.sol"; import {CurrencyLibrary, Currency} from "@uniswap/v4-core/contracts/types/Currency.sol"; import {TWAMM} from "../contracts/hooks/examples/TWAMM.sol"; import {ITWAMM} from "../contracts/interfaces/ITWAMM.sol"; import {PoolKey} from "@uniswap/v4-core/contracts/types/PoolKey.sol"; -contract TWAMMTest is Test, Deployers, GasSnapshot { +contract TWAMMTest is Test, Deployers, TokenFixture, GasSnapshot { using PoolIdLibrary for PoolKey; using CurrencyLibrary for Currency;