From 2bc751d62f695670dfce659a2bc287319ec09a56 Mon Sep 17 00:00:00 2001 From: Schlag <89420541+Schlagonia@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:09:17 -0600 Subject: [PATCH] fix: tests and snapshot (#9) * fix: tests * chore: add snapshot to make --- Makefile | 4 +++- src/test/Operation.t.sol | 7 ------- src/test/Shutdown.t.sol | 3 --- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 0949a888..3838face 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,8 @@ test-contract-gas :; forge test --gas-report --match-contract ${contract} --for trace-contract :; forge test -vvv --match-contract $(contract) --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY} test-test :; forge test -vv --match-test $(test) --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY} trace-test :; forge test -vvv --match-test $(test) --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY} +snapshot :; forge snapshot -vv --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY} +snapshot-diff :; forge snapshot --diff -vv --fork-url ${FORK_URL} --etherscan-api-key ${ETHERSCAN_API_KEY} + clean :; forge clean -snapshot :; forge snapshot \ No newline at end of file diff --git a/src/test/Operation.t.sol b/src/test/Operation.t.sol index de611e42..b3e01c01 100644 --- a/src/test/Operation.t.sol +++ b/src/test/Operation.t.sol @@ -47,9 +47,6 @@ contract OperationTest is Setup { vm.prank(user); strategy.redeem(_amount, user, user); - // TODO: Adjust if there are fees - checkStrategyTotals(strategy, 0, 0, 0); - assertGe( asset.balanceOf(user), balanceBefore + _amount, @@ -93,9 +90,6 @@ contract OperationTest is Setup { vm.prank(user); strategy.redeem(_amount, user, user); - uint256 expectedFees = (profit * strategy.performanceFee()) / MAX_BPS; - - // TODO: Adjust based on fees. assertGe( asset.balanceOf(user), balanceBefore + _amount, @@ -147,7 +141,6 @@ contract OperationTest is Setup { vm.prank(user); strategy.redeem(_amount, user, user); - // TODO: Adjust if there are fees assertGe( asset.balanceOf(user), balanceBefore + _amount, diff --git a/src/test/Shutdown.t.sol b/src/test/Shutdown.t.sol index 2a483f83..72aa39c7 100644 --- a/src/test/Shutdown.t.sol +++ b/src/test/Shutdown.t.sol @@ -34,9 +34,6 @@ contract ShutdownTest is Setup { vm.prank(user); strategy.redeem(_amount, user, user); - // TODO: Adjust if there are fees - checkStrategyTotals(strategy, 0, 0, 0); - assertGe( asset.balanceOf(user), balanceBefore + _amount,