Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove RewardsManager.sol #1041

Merged
merged 11 commits into from
Dec 20, 2023
Merged

Remove RewardsManager.sol #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ca5661e
compiles and unit tests run
EdNoepel Dec 15, 2023
8942237
merge develop
Dec 17, 2023
433de34
remove additional rewards manager references
Dec 17, 2023
50e2343
remove additional references
Dec 17, 2023
c541940
Merge branch 'develop' into remove-rewards-mgr
EdNoepel Dec 18, 2023
553655a
Merge branch 'remove-rewards-mgr' of github.com:ajna-finance/contract…
EdNoepel Dec 18, 2023
04c6ccd
fix ERC20PoolPositionHandler init logic
EdNoepel Dec 19, 2023
9fd555c
cleaned up folder naming and removed redundant function calls and dep…
ith-harvey Dec 19, 2023
4a0b2df
resolved conflicts with develop
Dec 19, 2023
3a63048
resolved naming and re-introduced Eds changes from 04c6ccd0d83669371a…
Dec 19, 2023
e0aeaed
Rename Positions dir
grandizzy Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/slither.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ jobs:
continue-on-error: true
id: position-analyzer

- name: Analyze RewardsManager Contract
run: |
slither src/RewardsManager.sol
continue-on-error: true
id: rewards-analyzer

- name: Analyze PoolInfoUtils Contract
run: |
slither src/PoolInfoUtils.sol
Expand Down
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# (-include to ignore error if it does not exist)
-include .env && source ./tests/forge/invariants/scenarios/scenario-${SCENARIO}.sh

CONTRACT_EXCLUDES="RegressionTest|Panic|RealWorld|Trading|Rewards"
CONTRACT_EXCLUDES="RegressionTest|Panic|RealWorld|Trading"
TEST_EXCLUDES="testLoad|invariant|test_regression"

all: clean install build
Expand All @@ -29,8 +29,6 @@ test-invariant-erc20 :; forge t --mt invariant --nmc ${CONTR
test-invariant-erc721 :; forge t --mt invariant --nmc ${CONTRACT_EXCLUDES} --mc ERC721
test-invariant-position-erc20 :; forge t --mt invariant --nmc ${CONTRACT_EXCLUDES} --mc ERC20PoolPosition
test-invariant-position-erc721 :; forge t --mt invariant --nmc ${CONTRACT_EXCLUDES} --mc ERC721PoolPosition
test-invariant-rewards-erc20 :; forge t --mt invariant --nmc ${CONTRACT_EXCLUDES} --mc ERC20PoolRewards
test-invariant-rewards-erc721 :; forge t --mt invariant --nmc ${CONTRACT_EXCLUDES} --mc ERC721PoolRewards
test-invariant :; forge t --mt ${MT} --nmc RegressionTest
test-invariant-erc20-precision :; ./tests/forge/invariants/test-invariant-erc20-precision.sh
test-invariant-erc721-precision :; ./tests/forge/invariants/test-invariant-erc721-precision.sh
Expand All @@ -54,7 +52,6 @@ test-swap-load-erc20 :; FOUNDRY_INVARIANT_SHRINK_SEQUENCE=false RUST
test-regression-all : test-regression-erc20 test-regression-erc721 test-regression-prototech
test-regression-erc20 :; forge t --mt test_regression --mc ERC20 --nmc "RealWorldRegression|Prototech"
test-regression-erc721 :; forge t --mt test_regression --mc ERC721 --nmc "RealWorldRegression|Prototech"
test-regression-rewards :; forge t --mt test_regression --mc Rewards --nmc "RealWorldRegression|Prototech"
test-regression-position :; forge t --mt test_regression --mc Position --nmc "RealWorldRegression|Prototech"
test-regression-prototech :; forge t --mt test_regression --mc Prototech
test-regression-rw :; forge t --mt test_regression --mc RealWorldRegression
Expand Down
Loading
Loading